diff mbox series

[v2] vhost-user-gpu: fix import of DMABUF

Message ID 20240513111305.666977-1-marcandre.lureau@redhat.com (mailing list archive)
State New
Headers show
Series [v2] vhost-user-gpu: fix import of DMABUF | expand

Commit Message

Marc-André Lureau May 13, 2024, 11:13 a.m. UTC 
From: Marc-André Lureau <marcandre.lureau@redhat.com>

When using vhost-user-gpu with GL, qemu -display gtk doesn't show output
and prints: qemu: eglCreateImageKHR failed

Since commit 9ac06df8b ("virtio-gpu-udmabuf: correct naming of
QemuDmaBuf size properties"), egl_dmabuf_import_texture() uses
backing_{width,height} for the texture dimension.

Fixes: commit 9ac06df8b ("virtio-gpu-udmabuf: correct naming of QemuDmaBuf size properties")
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 hw/display/vhost-user-gpu.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Kim, Dongwon May 13, 2024, 4:46 p.m. UTC | #1 
Hi Marc-André,

This commit looks good but are you planning to merge this before "ui/console: Private QemuDmaBuf struct"?
It will cause some conflict. Let me know if rebasing is needed on "ui/console: Private QemuDmaBuf struct".

> -----Original Message-----
> From: marcandre.lureau@redhat.com <marcandre.lureau@redhat.com>
> Sent: Monday, May 13, 2024 4:13 AM
> To: qemu-devel@nongnu.org
> Cc: Kim, Dongwon <dongwon.kim@intel.com>; Marc-André Lureau
> <marcandre.lureau@redhat.com>; Gerd Hoffmann <kraxel@redhat.com>;
> Michael S. Tsirkin <mst@redhat.com>
> Subject: [PATCH v2] vhost-user-gpu: fix import of DMABUF
> 
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> When using vhost-user-gpu with GL, qemu -display gtk doesn't show output
> and prints: qemu: eglCreateImageKHR failed
> 
> Since commit 9ac06df8b ("virtio-gpu-udmabuf: correct naming of
> QemuDmaBuf size properties"), egl_dmabuf_import_texture() uses
> backing_{width,height} for the texture dimension.
> 
> Fixes: commit 9ac06df8b ("virtio-gpu-udmabuf: correct naming of
> QemuDmaBuf size properties")
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  hw/display/vhost-user-gpu.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c index
> 709c8a02a1..96743aba8a 100644
> --- a/hw/display/vhost-user-gpu.c
> +++ b/hw/display/vhost-user-gpu.c
> @@ -273,8 +273,10 @@ vhost_user_gpu_handle_display(VhostUserGPU *g,
> VhostUserGpuMsg *msg)
>          }
>          *dmabuf = (QemuDmaBuf) {
>              .fd = fd,
> -            .width = m->fd_width,
> -            .height = m->fd_height,
> +            .width = m->width,
> +            .height = m->height,
> +            .backing_width = m->fd_width,
> +            .backing_height = m->fd_height,
>              .stride = m->fd_stride,
>              .fourcc = m->fd_drm_fourcc,
>              .y0_top = m->fd_flags & VIRTIO_GPU_RESOURCE_FLAG_Y_0_TOP,
> --
> 2.41.0.28.gd7d8841f67
diff mbox series

Patch

diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c
index 709c8a02a1..96743aba8a 100644
--- a/hw/display/vhost-user-gpu.c
+++ b/hw/display/vhost-user-gpu.c
@@ -273,8 +273,10 @@  vhost_user_gpu_handle_display(VhostUserGPU *g, VhostUserGpuMsg *msg)
         }
         *dmabuf = (QemuDmaBuf) {
             .fd = fd,
-            .width = m->fd_width,
-            .height = m->fd_height,
+            .width = m->width,
+            .height = m->height,
+            .backing_width = m->fd_width,
+            .backing_height = m->fd_height,
             .stride = m->fd_stride,
             .fourcc = m->fd_drm_fourcc,
             .y0_top = m->fd_flags & VIRTIO_GPU_RESOURCE_FLAG_Y_0_TOP,