From nobody Sat Feb 7 04:47:05 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612508564; cv=none; d=zohomail.com; s=zohoarc; b=kLPXvZPrFLi6S7nY1BdWGdaW1/acmdumrbmN4c9XCgPCXpBf+Q4b/4+Vi8tgQUCZjjgUhX3aneMK1V7G7HlW+ctq4fXQdlGYn9uK5lu1m+sf4KqDONRAf0GbOo3DW/mMPw2283MwgXWb+GQL7SMkc2ZoOhKXET+Lp2q/Mh2GwZQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612508564; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VpqN1X6lM/NqMScdBNfoLoqLAA7POIJ78WZvDIkb35k=; b=BWAefQ8nA/lb1FBjsCroKtjbUanIv/IByiw0l/q4hGd+8BhxeEMG8CAWLq4AbVCbeWwa9ULKE/8QnabsdgjrWEQ8F2WjQWzGQ9tSeoioGrpi5wVgaBCwiTN3D1XkDHeFcmgwqYGMB8cMMP41dnzJsIIi1FS8HZ3nkurj+PsQ03Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161250856470799.42980735792867; Thu, 4 Feb 2021 23:02:44 -0800 (PST) Received: from localhost ([::1]:55836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l7v8d-0001XR-N4 for importer@patchew.org; Fri, 05 Feb 2021 02:02:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7v34-0001GA-7L for qemu-devel@nongnu.org; Fri, 05 Feb 2021 01:56:58 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:46927) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l7v32-0001CS-Ad for qemu-devel@nongnu.org; Fri, 05 Feb 2021 01:56:57 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-447-vHZFAwf9NgyzkSdniCu64A-1; Fri, 05 Feb 2021 01:56:54 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 18E86192CC45 for ; Fri, 5 Feb 2021 06:56:53 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-108.ams2.redhat.com [10.36.113.108]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 37FEA722EF; Fri, 5 Feb 2021 06:56:42 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 3CB5518003BB; Fri, 5 Feb 2021 07:56:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612508215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VpqN1X6lM/NqMScdBNfoLoqLAA7POIJ78WZvDIkb35k=; b=eQ52reTlAWfblYRRccU27xSCMFcpeLS7lW2+dMEG5irNywCUEFvKXer/c87DTtYGHQtC0S xNvujssKETTLg6bsFnVyorZWn0T5DW0C/qz33cFye01gNUCzD4wj+rcqXo94UHSa5eggMb uWaJnxvm1Df9P1SbQzBUXXMfjajEfco= X-MC-Unique: vHZFAwf9NgyzkSdniCu64A-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 15/24] ui: add an optional get_flags callback to GraphicHwOps Date: Fri, 5 Feb 2021 07:56:11 +0100 Message-Id: <20210205065620.1726554-16-kraxel@redhat.com> In-Reply-To: <20210205065620.1726554-1-kraxel@redhat.com> References: <20210205065620.1726554-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.351, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Cleber Rosa , Wainer dos Santos Moschetta , Alex Williamson , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Those flags can be used to express different requirements for the display or other needs. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20210204105232.834642-12-marcandre.lureau@redhat.com> Signed-off-by: Gerd Hoffmann --- include/ui/console.h | 9 +++++++++ hw/display/virtio-gpu-base.c | 18 ++++++++++++++++++ hw/display/virtio-vga.c | 9 +++++++++ hw/vfio/display.c | 6 ++++++ 4 files changed, 42 insertions(+) diff --git a/include/ui/console.h b/include/ui/console.h index ac989fdf7016..0595aa9953cf 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -368,7 +368,16 @@ static inline void console_write_ch(console_ch_t *dest= , uint32_t ch) *dest =3D ch; } =20 +enum { + GRAPHIC_FLAGS_NONE =3D 0, + /* require a console/display with GL callbacks */ + GRAPHIC_FLAGS_GL =3D 1 << 0, + /* require a console/display with DMABUF import */ + GRAPHIC_FLAGS_DMABUF =3D 1 << 1, +}; + typedef struct GraphicHwOps { + int (*get_flags)(void *opaque); /* optional, default 0 */ void (*invalidate)(void *opaque); void (*gfx_update)(void *opaque); bool gfx_update_async; /* if true, calls graphic_hw_update_done() */ diff --git a/hw/display/virtio-gpu-base.c b/hw/display/virtio-gpu-base.c index 40ccd00f9421..f27a6fbe75d1 100644 --- a/hw/display/virtio-gpu-base.c +++ b/hw/display/virtio-gpu-base.c @@ -114,7 +114,25 @@ virtio_gpu_gl_block(void *opaque, bool block) } } =20 +static int +virtio_gpu_get_flags(void *opaque) +{ + VirtIOGPUBase *g =3D opaque; + int flags =3D GRAPHIC_FLAGS_NONE; + + if (virtio_gpu_virgl_enabled(g->conf)) { + flags |=3D GRAPHIC_FLAGS_GL; + } + + if (virtio_gpu_dmabuf_enabled(g->conf)) { + flags |=3D GRAPHIC_FLAGS_DMABUF; + } + + return flags; +} + static const GraphicHwOps virtio_gpu_ops =3D { + .get_flags =3D virtio_gpu_get_flags, .invalidate =3D virtio_gpu_invalidate_display, .gfx_update =3D virtio_gpu_update_display, .text_update =3D virtio_gpu_text_update, diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index 81f776ee36e7..b071909b6893 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -68,7 +68,16 @@ static void virtio_vga_base_gl_block(void *opaque, bool = block) } } =20 +static int virtio_vga_base_get_flags(void *opaque) +{ + VirtIOVGABase *vvga =3D opaque; + VirtIOGPUBase *g =3D vvga->vgpu; + + return g->hw_ops->get_flags(g); +} + static const GraphicHwOps virtio_vga_base_ops =3D { + .get_flags =3D virtio_vga_base_get_flags, .invalidate =3D virtio_vga_base_invalidate_display, .gfx_update =3D virtio_vga_base_update_display, .text_update =3D virtio_vga_base_text_update, diff --git a/hw/vfio/display.c b/hw/vfio/display.c index 42d67e870b71..f04473e3cece 100644 --- a/hw/vfio/display.c +++ b/hw/vfio/display.c @@ -335,7 +335,13 @@ static void vfio_display_dmabuf_update(void *opaque) } } =20 +static int vfio_display_get_flags(void *opaque) +{ + return GRAPHIC_FLAGS_GL | GRAPHIC_FLAGS_DMABUF; +} + static const GraphicHwOps vfio_display_dmabuf_ops =3D { + .get_flags =3D vfio_display_get_flags, .gfx_update =3D vfio_display_dmabuf_update, .ui_info =3D vfio_display_edid_ui_info, }; --=20 2.29.2