All of lore.kernel.org
 help / color / mirror / Atom feed
From: marcandre.lureau@redhat.com
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Cleber Rosa" <crosa@redhat.com>
Subject: [PATCH 11/20] ui: add an optional get_flags callback to GraphicHwOps
Date: Tue,  2 Feb 2021 18:26:16 +0400	[thread overview]
Message-ID: <20210202142625.609070-12-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20210202142625.609070-1-marcandre.lureau@redhat.com>

From: Marc-André Lureau <marcandre.lureau@redhat.com>

Those flags can be used to express different requirements for the
display or other needs.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 include/ui/console.h         |  9 +++++++++
 hw/display/virtio-gpu-base.c | 16 ++++++++++++++++
 hw/display/virtio-vga.c      |  9 +++++++++
 hw/vfio/display.c            |  6 ++++++
 4 files changed, 40 insertions(+)

diff --git a/include/ui/console.h b/include/ui/console.h
index ac989fdf70..0595aa9953 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 = ch;
 }
 
+enum {
+    GRAPHIC_FLAGS_NONE     = 0,
+    /* require a console/display with GL callbacks */
+    GRAPHIC_FLAGS_GL       = 1 << 0,
+    /* require a console/display with DMABUF import */
+    GRAPHIC_FLAGS_DMABUF   = 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 40ccd00f94..82c37aac62 100644
--- a/hw/display/virtio-gpu-base.c
+++ b/hw/display/virtio-gpu-base.c
@@ -114,7 +114,23 @@ virtio_gpu_gl_block(void *opaque, bool block)
     }
 }
 
+static int
+virtio_gpu_get_flags(void *opaque)
+{
+    VirtIOGPUBase *g = opaque;
+    int flags = GRAPHIC_FLAGS_NONE;
+
+    if (virtio_gpu_virgl_enabled(g->conf))
+        flags |= GRAPHIC_FLAGS_GL;
+
+    if (virtio_gpu_dmabuf_enabled(g->conf))
+        flags |= GRAPHIC_FLAGS_DMABUF;
+
+    return flags;
+}
+
 static const GraphicHwOps virtio_gpu_ops = {
+    .get_flags = virtio_gpu_get_flags,
     .invalidate = virtio_gpu_invalidate_display,
     .gfx_update = virtio_gpu_update_display,
     .text_update = virtio_gpu_text_update,
diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c
index 81f776ee36..b071909b68 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)
     }
 }
 
+static int virtio_vga_base_get_flags(void *opaque)
+{
+    VirtIOVGABase *vvga = opaque;
+    VirtIOGPUBase *g = vvga->vgpu;
+
+    return g->hw_ops->get_flags(g);
+}
+
 static const GraphicHwOps virtio_vga_base_ops = {
+    .get_flags = virtio_vga_base_get_flags,
     .invalidate = virtio_vga_base_invalidate_display,
     .gfx_update = virtio_vga_base_update_display,
     .text_update = virtio_vga_base_text_update,
diff --git a/hw/vfio/display.c b/hw/vfio/display.c
index 42d67e870b..f04473e3ce 100644
--- a/hw/vfio/display.c
+++ b/hw/vfio/display.c
@@ -335,7 +335,13 @@ static void vfio_display_dmabuf_update(void *opaque)
     }
 }
 
+static int vfio_display_get_flags(void *opaque)
+{
+    return GRAPHIC_FLAGS_GL | GRAPHIC_FLAGS_DMABUF;
+}
+
 static const GraphicHwOps vfio_display_dmabuf_ops = {
+    .get_flags  = vfio_display_get_flags,
     .gfx_update = vfio_display_dmabuf_update,
     .ui_info    = vfio_display_edid_ui_info,
 };
-- 
2.29.0



  parent reply	other threads:[~2021-02-02 14:42 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-02 14:26 [PATCH 00/20] Various vhost-user-gpu & UI fixes marcandre.lureau
2021-02-02 14:26 ` [PATCH 01/20] vhost-user-gpu: check backend for EDID support marcandre.lureau
2021-02-02 14:26 ` [PATCH 02/20] vhost-user-gpu: handle vhost-user-gpu features in a callback marcandre.lureau
2021-02-02 14:26 ` [PATCH 03/20] vhost-user-gpu: use an extandable state enum for commands marcandre.lureau
2021-02-02 14:26 ` [PATCH 04/20] vhost-user-gpu: handle display-info in a callback marcandre.lureau
2021-02-02 14:26 ` [PATCH 05/20] ui: remove extra #ifdef CONFIG_OPENGL marcandre.lureau
2021-02-02 14:26 ` [PATCH 06/20] ui: remove gl_ctx_get_current marcandre.lureau
2021-02-02 14:26 ` [PATCH 07/20] ui: add gd_gl_area_scanout_disable marcandre.lureau
2021-02-02 14:26 ` [PATCH 08/20] ui: annotate DCLOps callback requirements marcandre.lureau
2021-02-02 14:26 ` [PATCH 09/20] ui: remove console_has_gl_dmabuf() marcandre.lureau
2021-02-02 14:26 ` [PATCH 10/20] vhost-user-gpu: add a configuration flag for dmabuf usage marcandre.lureau
2021-02-02 14:26 ` marcandre.lureau [this message]
2021-02-03 15:48   ` [PATCH 11/20] ui: add an optional get_flags callback to GraphicHwOps Gerd Hoffmann
2021-02-03 22:21     ` Marc-André Lureau
2021-02-04  8:32       ` Gerd Hoffmann
2021-02-02 14:26 ` [PATCH 12/20] ui: add a DCLOps callback to check dmabuf support marcandre.lureau
2021-02-02 14:26 ` [PATCH 13/20] ui: check hw requirements during DCL registration marcandre.lureau
2021-02-02 14:26 ` [PATCH 14/20] ui: add qemu_egl_has_dmabuf helper marcandre.lureau
2021-02-02 14:26 ` [PATCH 15/20] ui: check gtk-egl dmabuf support marcandre.lureau
2021-02-02 14:26 ` [PATCH 16/20] ui: add egl dmabuf import to gtkglarea marcandre.lureau
2021-02-02 14:26 ` [PATCH 17/20] virtio-gpu: avoid re-entering cmdq processing marcandre.lureau
2021-02-02 14:26 ` [PATCH 18/20] display/ui: add a callback to indicate GL state is flushed marcandre.lureau
2021-02-02 14:26 ` [PATCH 19/20] chardev: check if the chardev is registered for yanking marcandre.lureau
2021-02-02 14:26 ` [PATCH 20/20] RFC: tests: add some virtio-gpu & vhost-user-gpu acceptance test marcandre.lureau
2021-02-03 11:38   ` Gerd Hoffmann
2021-02-03 13:33     ` Marc-André Lureau
2021-02-03 14:16       ` Gerd Hoffmann
2021-02-03 14:20         ` Marc-André Lureau
2021-02-02 14:57 ` [PATCH 00/20] Various vhost-user-gpu & UI fixes no-reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210202142625.609070-12-marcandre.lureau@redhat.com \
    --to=marcandre.lureau@redhat.com \
    --cc=crosa@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.