| Message ID | 20240321100635.64950-4-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | ui/console: initialize QemuDmaBuf in ui/console | expand |
Hi Phil, I submitted revised series (v4) based on your v3 work. I tried to address 2 or 3 major issues you mentioned there and some minor corrections. Please check it. I appreciate your help and feedback. [PATCH v4 0/3] ui/console: Introduce helpers for creating and > -----Original Message----- > From: Philippe Mathieu-Daudé <philmd@linaro.org> > Sent: Thursday, March 21, 2024 3:07 AM > To: Kim, Dongwon <dongwon.kim@intel.com>; qemu-devel@nongnu.org > Cc: Alex Williamson <alex.williamson@redhat.com>; Cédric Le Goater > <clg@redhat.com>; Marc-André Lureau <marcandre.lureau@redhat.com>; > Kasireddy, Vivek <vivek.kasireddy@intel.com>; Michael S. Tsirkin > <mst@redhat.com>; Gerd Hoffmann <kraxel@redhat.com>; Philippe Mathieu- > Daudé <philmd@linaro.org> > Subject: [INCOMPLETE PATCH v3 3/3] ui/console: Introduce > dpy_gl_create_dmabuf() helper > > From: Dongwon Kim <dongwon.kim@intel.com> > > It is safer to create, initialize, and access all the parameters in QemuDmaBuf > from a central location, ui/console, instead of hw/virtio-gpu or hw/vfio modules. > > Signed-off-by: Dongwon Kim <dongwon.kim@intel.com> > Message-Id: <20240320034229.3347130-1-dongwon.kim@intel.com> > [PMD: Split patch in 3, part 3/3] > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > Incomplete... VhostUserGPU doesn't allocate, > vhost_user_gpu_handle_display() crashes. > --- > include/hw/vfio/vfio-common.h | 2 +- > include/hw/virtio/virtio-gpu.h | 2 +- > include/ui/console.h | 7 +++++++ > hw/display/virtio-gpu-udmabuf.c | 23 ++++++++--------------- > hw/vfio/display.c | 24 ++++++++++-------------- > ui/console.c | 28 ++++++++++++++++++++++++++++ > 6 files changed, 55 insertions(+), 31 deletions(-) > > diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h > index b9da6c08ef..d66e27db02 100644 > --- a/include/hw/vfio/vfio-common.h > +++ b/include/hw/vfio/vfio-common.h > @@ -148,7 +148,7 @@ typedef struct VFIOGroup { } VFIOGroup; > > typedef struct VFIODMABuf { > - QemuDmaBuf buf; > + QemuDmaBuf *buf; > uint32_t pos_x, pos_y, pos_updates; > uint32_t hot_x, hot_y, hot_updates; > int dmabuf_id; > diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index > ed44cdad6b..010083e8e3 100644 > --- a/include/hw/virtio/virtio-gpu.h > +++ b/include/hw/virtio/virtio-gpu.h > @@ -169,7 +169,7 @@ struct VirtIOGPUBaseClass { > DEFINE_PROP_UINT32("yres", _state, _conf.yres, 800) > > typedef struct VGPUDMABuf { > - QemuDmaBuf buf; > + QemuDmaBuf *buf; > uint32_t scanout_id; > QTAILQ_ENTRY(VGPUDMABuf) next; > } VGPUDMABuf; > diff --git a/include/ui/console.h b/include/ui/console.h index > 1f3d025548..0b823efb2e 100644 > --- a/include/ui/console.h > +++ b/include/ui/console.h > @@ -279,6 +279,7 @@ typedef struct DisplayChangeListenerOps { > /* optional */ > void (*dpy_gl_cursor_position)(DisplayChangeListener *dcl, > uint32_t pos_x, uint32_t pos_y); > + > /* optional */ > void (*dpy_gl_release_dmabuf)(DisplayChangeListener *dcl, > QemuDmaBuf *dmabuf); @@ -358,6 +359,12 @@ void > dpy_gl_cursor_dmabuf(QemuConsole *con, QemuDmaBuf *dmabuf, > bool have_hot, uint32_t hot_x, uint32_t hot_y); void > dpy_gl_cursor_position(QemuConsole *con, > uint32_t pos_x, uint32_t pos_y); > +QemuDmaBuf *dpy_gl_create_dmabuf(uint32_t width, uint32_t height, > + uint32_t stride, uint32_t x, > + uint32_t y, uint32_t backing_width, > + uint32_t backing_height, uint32_t fourcc, > + uint32_t modifier, uint32_t dmabuf_fd, > + bool allow_fences); > uint32_t dpy_gl_dmabuf_get_width(QemuDmaBuf *dmabuf); uint32_t > dpy_gl_dmabuf_get_height(QemuDmaBuf *dmabuf); int32_t > dpy_gl_dmabuf_get_fd(QemuDmaBuf *dmabuf); diff --git a/hw/display/virtio- > gpu-udmabuf.c b/hw/display/virtio-gpu-udmabuf.c index > d680e871c1..dde6c8e9d9 100644 > --- a/hw/display/virtio-gpu-udmabuf.c > +++ b/hw/display/virtio-gpu-udmabuf.c > @@ -162,7 +162,7 @@ static void virtio_gpu_free_dmabuf(VirtIOGPU *g, > VGPUDMABuf *dmabuf) > struct virtio_gpu_scanout *scanout; > > scanout = &g->parent_obj.scanout[dmabuf->scanout_id]; > - dpy_gl_release_dmabuf(scanout->con, &dmabuf->buf); > + dpy_gl_release_dmabuf(scanout->con, dmabuf->buf); > QTAILQ_REMOVE(&g->dmabuf.bufs, dmabuf, next); > g_free(dmabuf); > } > @@ -181,17 +181,10 @@ static VGPUDMABuf > } > > dmabuf = g_new0(VGPUDMABuf, 1); > - dmabuf->buf.width = r->width; > - dmabuf->buf.height = r->height; > - dmabuf->buf.stride = fb->stride; > - dmabuf->buf.x = r->x; > - dmabuf->buf.y = r->y; > - dmabuf->buf.backing_width = fb->width; > - dmabuf->buf.backing_height = fb->height; > - dmabuf->buf.fourcc = qemu_pixman_to_drm_format(fb->format); > - dmabuf->buf.fd = res->dmabuf_fd; > - dmabuf->buf.allow_fences = true; > - dmabuf->buf.draw_submitted = false; > + dmabuf->buf = dpy_gl_create_dmabuf(r->width, r->height, fb->stride, > + r->x, r->y, fb->width, fb->height, > + qemu_pixman_to_drm_format(fb->format), > + 0, res->dmabuf_fd, false); > dmabuf->scanout_id = scanout_id; > QTAILQ_INSERT_HEAD(&g->dmabuf.bufs, dmabuf, next); > > @@ -213,8 +206,8 @@ int virtio_gpu_update_dmabuf(VirtIOGPU *g, > return -EINVAL; > } > > - width = dpy_gl_dmabuf_get_width(&new_primary->buf); > - height = dpy_gl_dmabuf_get_height(&new_primary->buf); > + width = dpy_gl_dmabuf_get_width(new_primary->buf); > + height = dpy_gl_dmabuf_get_height(new_primary->buf); > > if (g->dmabuf.primary[scanout_id]) { > old_primary = g->dmabuf.primary[scanout_id]; @@ -222,7 +215,7 @@ int > virtio_gpu_update_dmabuf(VirtIOGPU *g, > > g->dmabuf.primary[scanout_id] = new_primary; > qemu_console_resize(scanout->con, width, height); > - dpy_gl_scanout_dmabuf(scanout->con, &new_primary->buf); > + dpy_gl_scanout_dmabuf(scanout->con, new_primary->buf); > > if (old_primary) { > virtio_gpu_free_dmabuf(g, old_primary); diff --git a/hw/vfio/display.c > b/hw/vfio/display.c index 676b2fc5f3..a3bdb01789 100644 > --- a/hw/vfio/display.c > +++ b/hw/vfio/display.c > @@ -241,14 +241,10 @@ static VFIODMABuf > *vfio_display_get_dmabuf(VFIOPCIDevice *vdev, > > dmabuf = g_new0(VFIODMABuf, 1); > dmabuf->dmabuf_id = plane.dmabuf_id; > - dmabuf->buf.width = plane.width; > - dmabuf->buf.height = plane.height; > - dmabuf->buf.backing_width = plane.width; > - dmabuf->buf.backing_height = plane.height; > - dmabuf->buf.stride = plane.stride; > - dmabuf->buf.fourcc = plane.drm_format; > - dmabuf->buf.modifier = plane.drm_format_mod; > - dmabuf->buf.fd = fd; > + dmabuf->buf = dpy_gl_create_dmabuf(plane.width, plane.height, > plane.stride, > + 0, 0, plane.width, plane.height, > + plane.drm_format, plane.drm_format_mod, > + fd, false); > if (plane_type == DRM_PLANE_TYPE_CURSOR) { > vfio_display_update_cursor(dmabuf, &plane); > } > @@ -262,12 +258,12 @@ static void > vfio_display_free_one_dmabuf(VFIODisplay *dpy, VFIODMABuf *dmabuf) > int fd; > > QTAILQ_REMOVE(&dpy->dmabuf.bufs, dmabuf, next); > - fd = dpy_gl_dmabuf_get_fd(&dmabuf->buf); > + fd = dpy_gl_dmabuf_get_fd(dmabuf->buf); > if (fd > -1) { > close(fd); > } > > - dpy_gl_release_dmabuf(dpy->con, &dmabuf->buf); > + dpy_gl_release_dmabuf(dpy->con, dmabuf->buf); > g_free(dmabuf); > } > > @@ -303,13 +299,13 @@ static void vfio_display_dmabuf_update(void > *opaque) > return; > } > > - width = dpy_gl_dmabuf_get_width(&primary->buf); > - height = dpy_gl_dmabuf_get_height(&primary->buf); > + width = dpy_gl_dmabuf_get_width(primary->buf); > + height = dpy_gl_dmabuf_get_height(primary->buf); > > if (dpy->dmabuf.primary != primary) { > dpy->dmabuf.primary = primary; > qemu_console_resize(dpy->con, width, height); > - dpy_gl_scanout_dmabuf(dpy->con, &primary->buf); > + dpy_gl_scanout_dmabuf(dpy->con, primary->buf); > free_bufs = true; > } > > @@ -323,7 +319,7 @@ static void vfio_display_dmabuf_update(void *opaque) > if (cursor && (new_cursor || cursor->hot_updates)) { > bool have_hot = (cursor->hot_x != 0xffffffff && > cursor->hot_y != 0xffffffff); > - dpy_gl_cursor_dmabuf(dpy->con, &cursor->buf, have_hot, > + dpy_gl_cursor_dmabuf(dpy->con, cursor->buf, have_hot, > cursor->hot_x, cursor->hot_y); > cursor->hot_updates = 0; > } else if (!cursor && new_cursor) { diff --git a/ui/console.c b/ui/console.c > index 10abeb9780..616d636912 100644 > --- a/ui/console.c > +++ b/ui/console.c > @@ -1190,6 +1190,33 @@ void dpy_gl_cursor_position(QemuConsole *con, > } > } > > +QemuDmaBuf *dpy_gl_create_dmabuf(uint32_t width, uint32_t height, > + uint32_t stride, uint32_t x, > + uint32_t y, uint32_t backing_width, > + uint32_t backing_height, uint32_t fourcc, > + uint32_t modifier, uint32_t dmabuf_fd, > + bool allow_fences) { > + QemuDmaBuf *dmabuf; > + > + dmabuf = g_new0(QemuDmaBuf, 1); > + > + dmabuf->width = width; > + dmabuf->height = height; > + dmabuf->stride = stride; > + dmabuf->x = x; > + dmabuf->y = y; > + dmabuf->backing_width = backing_width; > + dmabuf->backing_height = backing_height; > + dmabuf->fourcc = fourcc; > + dmabuf->modifier = modifier; > + dmabuf->fd = dmabuf_fd; > + dmabuf->allow_fences = allow_fences; > + dmabuf->fence_fd = -1; > + > + return dmabuf; > +} > + > uint32_t dpy_gl_dmabuf_get_width(QemuDmaBuf *dmabuf) { > if (dmabuf) { > @@ -1230,6 +1257,7 @@ void dpy_gl_release_dmabuf(QemuConsole *con, > if (dcl->ops->dpy_gl_release_dmabuf) { > dcl->ops->dpy_gl_release_dmabuf(dcl, dmabuf); > } > + g_free(dmabuf); > } > } > > -- > 2.41.0
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index b9da6c08ef..d66e27db02 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -148,7 +148,7 @@ typedef struct VFIOGroup { } VFIOGroup; typedef struct VFIODMABuf { - QemuDmaBuf buf; + QemuDmaBuf *buf; uint32_t pos_x, pos_y, pos_updates; uint32_t hot_x, hot_y, hot_updates; int dmabuf_id; diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index ed44cdad6b..010083e8e3 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -169,7 +169,7 @@ struct VirtIOGPUBaseClass { DEFINE_PROP_UINT32("yres", _state, _conf.yres, 800) typedef struct VGPUDMABuf { - QemuDmaBuf buf; + QemuDmaBuf *buf; uint32_t scanout_id; QTAILQ_ENTRY(VGPUDMABuf) next; } VGPUDMABuf; diff --git a/include/ui/console.h b/include/ui/console.h index 1f3d025548..0b823efb2e 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -279,6 +279,7 @@ typedef struct DisplayChangeListenerOps { /* optional */ void (*dpy_gl_cursor_position)(DisplayChangeListener *dcl, uint32_t pos_x, uint32_t pos_y); + /* optional */ void (*dpy_gl_release_dmabuf)(DisplayChangeListener *dcl, QemuDmaBuf *dmabuf); @@ -358,6 +359,12 @@ void dpy_gl_cursor_dmabuf(QemuConsole *con, QemuDmaBuf *dmabuf, bool have_hot, uint32_t hot_x, uint32_t hot_y); void dpy_gl_cursor_position(QemuConsole *con, uint32_t pos_x, uint32_t pos_y); +QemuDmaBuf *dpy_gl_create_dmabuf(uint32_t width, uint32_t height, + uint32_t stride, uint32_t x, + uint32_t y, uint32_t backing_width, + uint32_t backing_height, uint32_t fourcc, + uint32_t modifier, uint32_t dmabuf_fd, + bool allow_fences); uint32_t dpy_gl_dmabuf_get_width(QemuDmaBuf *dmabuf); uint32_t dpy_gl_dmabuf_get_height(QemuDmaBuf *dmabuf); int32_t dpy_gl_dmabuf_get_fd(QemuDmaBuf *dmabuf); diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabuf.c index d680e871c1..dde6c8e9d9 100644 --- a/hw/display/virtio-gpu-udmabuf.c +++ b/hw/display/virtio-gpu-udmabuf.c @@ -162,7 +162,7 @@ static void virtio_gpu_free_dmabuf(VirtIOGPU *g, VGPUDMABuf *dmabuf) struct virtio_gpu_scanout *scanout; scanout = &g->parent_obj.scanout[dmabuf->scanout_id]; - dpy_gl_release_dmabuf(scanout->con, &dmabuf->buf); + dpy_gl_release_dmabuf(scanout->con, dmabuf->buf); QTAILQ_REMOVE(&g->dmabuf.bufs, dmabuf, next); g_free(dmabuf); } @@ -181,17 +181,10 @@ static VGPUDMABuf } dmabuf = g_new0(VGPUDMABuf, 1); - dmabuf->buf.width = r->width; - dmabuf->buf.height = r->height; - dmabuf->buf.stride = fb->stride; - dmabuf->buf.x = r->x; - dmabuf->buf.y = r->y; - dmabuf->buf.backing_width = fb->width; - dmabuf->buf.backing_height = fb->height; - dmabuf->buf.fourcc = qemu_pixman_to_drm_format(fb->format); - dmabuf->buf.fd = res->dmabuf_fd; - dmabuf->buf.allow_fences = true; - dmabuf->buf.draw_submitted = false; + dmabuf->buf = dpy_gl_create_dmabuf(r->width, r->height, fb->stride, + r->x, r->y, fb->width, fb->height, + qemu_pixman_to_drm_format(fb->format), + 0, res->dmabuf_fd, false); dmabuf->scanout_id = scanout_id; QTAILQ_INSERT_HEAD(&g->dmabuf.bufs, dmabuf, next); @@ -213,8 +206,8 @@ int virtio_gpu_update_dmabuf(VirtIOGPU *g, return -EINVAL; } - width = dpy_gl_dmabuf_get_width(&new_primary->buf); - height = dpy_gl_dmabuf_get_height(&new_primary->buf); + width = dpy_gl_dmabuf_get_width(new_primary->buf); + height = dpy_gl_dmabuf_get_height(new_primary->buf); if (g->dmabuf.primary[scanout_id]) { old_primary = g->dmabuf.primary[scanout_id]; @@ -222,7 +215,7 @@ int virtio_gpu_update_dmabuf(VirtIOGPU *g, g->dmabuf.primary[scanout_id] = new_primary; qemu_console_resize(scanout->con, width, height); - dpy_gl_scanout_dmabuf(scanout->con, &new_primary->buf); + dpy_gl_scanout_dmabuf(scanout->con, new_primary->buf); if (old_primary) { virtio_gpu_free_dmabuf(g, old_primary); diff --git a/hw/vfio/display.c b/hw/vfio/display.c index 676b2fc5f3..a3bdb01789 100644 --- a/hw/vfio/display.c +++ b/hw/vfio/display.c @@ -241,14 +241,10 @@ static VFIODMABuf *vfio_display_get_dmabuf(VFIOPCIDevice *vdev, dmabuf = g_new0(VFIODMABuf, 1); dmabuf->dmabuf_id = plane.dmabuf_id; - dmabuf->buf.width = plane.width; - dmabuf->buf.height = plane.height; - dmabuf->buf.backing_width = plane.width; - dmabuf->buf.backing_height = plane.height; - dmabuf->buf.stride = plane.stride; - dmabuf->buf.fourcc = plane.drm_format; - dmabuf->buf.modifier = plane.drm_format_mod; - dmabuf->buf.fd = fd; + dmabuf->buf = dpy_gl_create_dmabuf(plane.width, plane.height, plane.stride, + 0, 0, plane.width, plane.height, + plane.drm_format, plane.drm_format_mod, + fd, false); if (plane_type == DRM_PLANE_TYPE_CURSOR) { vfio_display_update_cursor(dmabuf, &plane); } @@ -262,12 +258,12 @@ static void vfio_display_free_one_dmabuf(VFIODisplay *dpy, VFIODMABuf *dmabuf) int fd; QTAILQ_REMOVE(&dpy->dmabuf.bufs, dmabuf, next); - fd = dpy_gl_dmabuf_get_fd(&dmabuf->buf); + fd = dpy_gl_dmabuf_get_fd(dmabuf->buf); if (fd > -1) { close(fd); } - dpy_gl_release_dmabuf(dpy->con, &dmabuf->buf); + dpy_gl_release_dmabuf(dpy->con, dmabuf->buf); g_free(dmabuf); } @@ -303,13 +299,13 @@ static void vfio_display_dmabuf_update(void *opaque) return; } - width = dpy_gl_dmabuf_get_width(&primary->buf); - height = dpy_gl_dmabuf_get_height(&primary->buf); + width = dpy_gl_dmabuf_get_width(primary->buf); + height = dpy_gl_dmabuf_get_height(primary->buf); if (dpy->dmabuf.primary != primary) { dpy->dmabuf.primary = primary; qemu_console_resize(dpy->con, width, height); - dpy_gl_scanout_dmabuf(dpy->con, &primary->buf); + dpy_gl_scanout_dmabuf(dpy->con, primary->buf); free_bufs = true; } @@ -323,7 +319,7 @@ static void vfio_display_dmabuf_update(void *opaque) if (cursor && (new_cursor || cursor->hot_updates)) { bool have_hot = (cursor->hot_x != 0xffffffff && cursor->hot_y != 0xffffffff); - dpy_gl_cursor_dmabuf(dpy->con, &cursor->buf, have_hot, + dpy_gl_cursor_dmabuf(dpy->con, cursor->buf, have_hot, cursor->hot_x, cursor->hot_y); cursor->hot_updates = 0; } else if (!cursor && new_cursor) { diff --git a/ui/console.c b/ui/console.c index 10abeb9780..616d636912 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1190,6 +1190,33 @@ void dpy_gl_cursor_position(QemuConsole *con, } } +QemuDmaBuf *dpy_gl_create_dmabuf(uint32_t width, uint32_t height, + uint32_t stride, uint32_t x, + uint32_t y, uint32_t backing_width, + uint32_t backing_height, uint32_t fourcc, + uint32_t modifier, uint32_t dmabuf_fd, + bool allow_fences) +{ + QemuDmaBuf *dmabuf; + + dmabuf = g_new0(QemuDmaBuf, 1); + + dmabuf->width = width; + dmabuf->height = height; + dmabuf->stride = stride; + dmabuf->x = x; + dmabuf->y = y; + dmabuf->backing_width = backing_width; + dmabuf->backing_height = backing_height; + dmabuf->fourcc = fourcc; + dmabuf->modifier = modifier; + dmabuf->fd = dmabuf_fd; + dmabuf->allow_fences = allow_fences; + dmabuf->fence_fd = -1; + + return dmabuf; +} + uint32_t dpy_gl_dmabuf_get_width(QemuDmaBuf *dmabuf) { if (dmabuf) { @@ -1230,6 +1257,7 @@ void dpy_gl_release_dmabuf(QemuConsole *con, if (dcl->ops->dpy_gl_release_dmabuf) { dcl->ops->dpy_gl_release_dmabuf(dcl, dmabuf); } + g_free(dmabuf); } }