[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/27] ui: simplify gl unblock & flush
From: |
marcandre . lureau |
Subject: |
[PATCH 09/27] ui: simplify gl unblock & flush |
Date: |
Fri, 12 Mar 2021 14:00:50 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
GraphicHw.gl_flushed was introduced to notify the
device (vhost-user-gpu) that the GL resources (the display scanout) are
no longer needed.
It was decoupled from QEMU own gl-blocking mechanism, but that
difference isn't really helping. Instead, we can reuse QEMU gl-blocking
and notify virtio_gpu_gl_flueshd() when unblocking (to unlock
vhost-user-gpu).
An extra block/unblock is added arount dpy_gl_update() so existing
backends that don't block will have the flush event handled. It will
also help when there are no backends associated.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/ui/console.h | 2 --
hw/display/vhost-user-gpu.c | 2 +-
hw/display/virtio-gpu-base.c | 5 ++++-
hw/display/virtio-vga.c | 11 -----------
ui/console.c | 12 +++---------
ui/gtk-egl.c | 1 -
ui/gtk-gl-area.c | 1 -
ui/sdl2-gl.c | 2 --
ui/spice-display.c | 1 -
9 files changed, 8 insertions(+), 29 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index 9391fb052b..a8c2b9f479 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -393,7 +393,6 @@ typedef struct GraphicHwOps {
void (*update_interval)(void *opaque, uint64_t interval);
int (*ui_info)(void *opaque, uint32_t head, QemuUIInfo *info);
void (*gl_block)(void *opaque, bool block);
- void (*gl_flushed)(void *opaque);
} GraphicHwOps;
QemuConsole *graphic_console_init(DeviceState *dev, uint32_t head,
@@ -409,7 +408,6 @@ void graphic_hw_update_done(QemuConsole *con);
void graphic_hw_invalidate(QemuConsole *con);
void graphic_hw_text_update(QemuConsole *con, console_ch_t *chardata);
void graphic_hw_gl_block(QemuConsole *con, bool block);
-void graphic_hw_gl_flushed(QemuConsole *con);
void qemu_console_early_init(void);
diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c
index a01f9315e1..a2a011e9cc 100644
--- a/hw/display/vhost-user-gpu.c
+++ b/hw/display/vhost-user-gpu.c
@@ -254,8 +254,8 @@ vhost_user_gpu_handle_display(VhostUserGPU *g,
VhostUserGpuMsg *msg)
vhost_user_gpu_unblock(g);
break;
}
- dpy_gl_update(con, m->x, m->y, m->width, m->height);
g->backend_blocked = true;
+ dpy_gl_update(con, m->x, m->y, m->width, m->height);
break;
}
case VHOST_USER_GPU_UPDATE: {
diff --git a/hw/display/virtio-gpu-base.c b/hw/display/virtio-gpu-base.c
index 25f8920fdb..ee2753001a 100644
--- a/hw/display/virtio-gpu-base.c
+++ b/hw/display/virtio-gpu-base.c
@@ -118,6 +118,10 @@ virtio_gpu_gl_block(void *opaque, bool block)
g->renderer_blocked--;
}
assert(g->renderer_blocked >= 0);
+
+ if (!block && g->renderer_blocked == 0) {
+ virtio_gpu_gl_flushed(g);
+ }
}
static int
@@ -144,7 +148,6 @@ static const GraphicHwOps virtio_gpu_ops = {
.text_update = virtio_gpu_text_update,
.ui_info = virtio_gpu_ui_info,
.gl_block = virtio_gpu_gl_block,
- .gl_flushed = virtio_gpu_gl_flushed,
};
bool
diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c
index d3c6404061..b071909b68 100644
--- a/hw/display/virtio-vga.c
+++ b/hw/display/virtio-vga.c
@@ -68,16 +68,6 @@ static void virtio_vga_base_gl_block(void *opaque, bool
block)
}
}
-static void virtio_vga_base_gl_flushed(void *opaque)
-{
- VirtIOVGABase *vvga = opaque;
- VirtIOGPUBase *g = vvga->vgpu;
-
- if (g->hw_ops->gl_flushed) {
- g->hw_ops->gl_flushed(g);
- }
-}
-
static int virtio_vga_base_get_flags(void *opaque)
{
VirtIOVGABase *vvga = opaque;
@@ -93,7 +83,6 @@ static const GraphicHwOps virtio_vga_base_ops = {
.text_update = virtio_vga_base_text_update,
.ui_info = virtio_vga_base_ui_info,
.gl_block = virtio_vga_base_gl_block,
- .gl_flushed = virtio_vga_base_gl_flushed,
};
static const VMStateDescription vmstate_virtio_vga_base = {
diff --git a/ui/console.c b/ui/console.c
index 808f82fa64..18311707bd 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -318,15 +318,6 @@ void graphic_hw_gl_block(QemuConsole *con, bool block)
}
}
-void graphic_hw_gl_flushed(QemuConsole *con)
-{
- assert(con != NULL);
-
- if (con->hw_ops->gl_flushed) {
- con->hw_ops->gl_flushed(con->hw);
- }
-}
-
int qemu_console_get_window_id(QemuConsole *con)
{
return con->window_id;
@@ -1953,7 +1944,10 @@ void dpy_gl_update(QemuConsole *con,
uint32_t x, uint32_t y, uint32_t w, uint32_t h)
{
assert(con->gl);
+
+ graphic_hw_gl_block(con, true);
con->gl->ops->dpy_gl_update(con->gl, x, y, w, h);
+ graphic_hw_gl_block(con, false);
}
/***********************************************************/
diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c
index 2a2e6d3a17..48603abfbd 100644
--- a/ui/gtk-egl.c
+++ b/ui/gtk-egl.c
@@ -94,7 +94,6 @@ void gd_egl_draw(VirtualConsole *vc)
}
glFlush();
- graphic_hw_gl_flushed(vc->gfx.dcl.con);
}
void gd_egl_update(DisplayChangeListener *dcl,
diff --git a/ui/gtk-gl-area.c b/ui/gtk-gl-area.c
index dd5783fec7..e895938a96 100644
--- a/ui/gtk-gl-area.c
+++ b/ui/gtk-gl-area.c
@@ -72,7 +72,6 @@ void gd_gl_area_draw(VirtualConsole *vc)
}
glFlush();
- graphic_hw_gl_flushed(vc->gfx.dcl.con);
}
void gd_gl_area_update(DisplayChangeListener *dcl,
diff --git a/ui/sdl2-gl.c b/ui/sdl2-gl.c
index a21d2deed9..5b950fbbea 100644
--- a/ui/sdl2-gl.c
+++ b/ui/sdl2-gl.c
@@ -58,7 +58,6 @@ static void sdl2_gl_render_surface(struct sdl2_console *scon)
surface_gl_render_texture(scon->gls, scon->surface);
SDL_GL_SwapWindow(scon->real_window);
- graphic_hw_gl_flushed(scon->dcl.con);
}
void sdl2_gl_update(DisplayChangeListener *dcl,
@@ -241,5 +240,4 @@ void sdl2_gl_scanout_flush(DisplayChangeListener *dcl,
egl_fb_blit(&scon->win_fb, &scon->guest_fb, !scon->y0_top);
SDL_GL_SwapWindow(scon->real_window);
- graphic_hw_gl_flushed(dcl->con);
}
diff --git a/ui/spice-display.c b/ui/spice-display.c
index f637fd1bc6..24f5cc30f1 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -826,7 +826,6 @@ static void qemu_spice_gl_unblock_bh(void *opaque)
SimpleSpiceDisplay *ssd = opaque;
qemu_spice_gl_block(ssd, false);
- graphic_hw_gl_flushed(ssd->dcl.con);
}
static void qemu_spice_gl_block_timer(void *opaque)
--
2.29.0
- [PATCH 01/27] ui: fold qemu_alloc_display in only caller, (continued)
- [PATCH 01/27] ui: fold qemu_alloc_display in only caller, marcandre . lureau, 2021/03/12
- [PATCH 02/27] vhost-user-gpu: glFlush before notifying clients, marcandre . lureau, 2021/03/12
- [PATCH 03/27] vhost-user-gpu: fix vugbm_device_init fallback, marcandre . lureau, 2021/03/12
- [PATCH 04/27] vhost-user-gpu: fix cursor move/update, marcandre . lureau, 2021/03/12
- [PATCH 05/27] ui: factor out qemu_console_set_display_gl_ctx(), marcandre . lureau, 2021/03/12
- [PATCH 06/27] ui: associate GL context outside of display listener registration, marcandre . lureau, 2021/03/12
- [PATCH 07/27] ui: make gl_block use a counter, marcandre . lureau, 2021/03/12
- [PATCH 08/27] ui: add a gl-unblock warning timer, marcandre . lureau, 2021/03/12
- [PATCH 09/27] ui: simplify gl unblock & flush,
marcandre . lureau <=
- [PATCH 10/27] ui: dispatch GL events to all listeners, marcandre . lureau, 2021/03/12
- [PATCH 11/27] ui: split the GL context in a different object, marcandre . lureau, 2021/03/12
- [PATCH 12/27] ui: move qemu_spice_fill_device_address to ui/util.c, marcandre . lureau, 2021/03/12
- [PATCH 13/27] console: save current scanout details, marcandre . lureau, 2021/03/12
- [PATCH 14/27] ui: add a D-Bus display backend, marcandre . lureau, 2021/03/12
- [PATCH 15/27] audio: add dbusaudio backend, marcandre . lureau, 2021/03/12
- [PATCH 16/27] vhost-user-gpu: add vg_send_disable_scanout(), marcandre . lureau, 2021/03/12