The 2D and dmabuf scanout paths disagreed on who owns
virtio_gpu_scanout::ds and on when the frontend dmabuf is released.
Disabling the scanout (width == 0) installs a placeholder surface
through qemu_console_set_surface(), which frees the surface it replaces,
leaving ds dangling. The next VHOST_USER_GPU_UPDATE then composited into
the freed surface and installed it again. Only free a surface the console
did not install, and drop updates that arrive without a scanout surface.
Fixes: 267f664658fe ("hw/display: add vhost-user-vga & gpu-pci")
Signed-off-by: Marc-André Lureau <[email protected]>
---
hw/display/vhost-user-gpu.c | 32 +++++++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c
index 4eab482f2181..63776ab30ac5 100644
--- a/hw/display/vhost-user-gpu.c
+++ b/hw/display/vhost-user-gpu.c
@@ -192,6 +192,19 @@ vhost_user_gpu_unblock(VhostUserGPU *g)
vhost_user_gpu_send_msg(g, &msg);
}
+/*
+ * A surface not installed on the console is owned by the device, the
+ * installed one is freed by qemu_console_set_surface().
+ */
+static void
+vhost_user_gpu_clear_scanout_ds(struct virtio_gpu_scanout *s)
+{
+ if (s->ds && s->ds != qemu_console_surface(s->con)) {
+ qemu_free_displaysurface(s->ds);
+ }
+ s->ds = NULL;
+}
+
static void
vhost_user_gpu_handle_display(VhostUserGPU *g, VhostUserGpuMsg *msg)
{
@@ -262,6 +275,13 @@ vhost_user_gpu_handle_display(VhostUserGPU *g,
VhostUserGpuMsg *msg)
s = &g->parent_obj.scanout[m->scanout_id];
con = s->con;
+ if (g->dmabuf[m->scanout_id]) {
+ qemu_console_gl_release_dmabuf(con, g->dmabuf[m->scanout_id]);
+ g_clear_pointer(&g->dmabuf[m->scanout_id], qemu_dmabuf_free);
+ }
+
+ vhost_user_gpu_clear_scanout_ds(s);
+
if (m->width == 0) {
qemu_console_set_surface(con, NULL);
} else {
@@ -289,7 +309,8 @@ vhost_user_gpu_handle_display(VhostUserGPU *g,
VhostUserGpuMsg *msg)
}
g->parent_obj.enable = 1;
- con = g->parent_obj.scanout[m->scanout_id].con;
+ s = &g->parent_obj.scanout[m->scanout_id];
+ con = s->con;
old = g->dmabuf[m->scanout_id];
if (fd == -1) {
@@ -297,6 +318,7 @@ vhost_user_gpu_handle_display(VhostUserGPU *g,
VhostUserGpuMsg *msg)
qemu_console_gl_release_dmabuf(con, old);
g_clear_pointer(&g->dmabuf[m->scanout_id], qemu_dmabuf_free);
}
+ vhost_user_gpu_clear_scanout_ds(s);
qemu_console_gl_scanout_disable(con);
break;
}
@@ -306,6 +328,8 @@ vhost_user_gpu_handle_display(VhostUserGPU *g,
VhostUserGpuMsg *msg)
modifier = m2->modifier;
}
+ vhost_user_gpu_clear_scanout_ds(s);
+
dmabuf = qemu_dmabuf_new(m->width, m->height,
&offset, &stride, 0, 0,
m->fd_width, m->fd_height,
@@ -360,6 +384,11 @@ vhost_user_gpu_handle_display(VhostUserGPU *g,
VhostUserGpuMsg *msg)
s = &g->parent_obj.scanout[m->scanout_id];
con = s->con;
+ if (!s->ds) {
+ error_report("vhost-user-gpu: no 2D scanout surface"
+ " for scanout %d", m->scanout_id);
+ break;
+ }
pixman_image_t *image =
pixman_image_create_bits(PIXMAN_x8r8g8b8,
m->width,
@@ -659,6 +688,7 @@ vhost_user_gpu_reset(VirtIODevice *vdev)
g_clear_pointer(&g->dmabuf[i], qemu_dmabuf_free);
}
qemu_console_gl_scanout_disable(scanout->con);
+ vhost_user_gpu_clear_scanout_ds(scanout);
qemu_console_set_surface(scanout->con, NULL);
}
--
2.56.0.116.g6de20f6092dc