This commit introduces a regression when using GVT-g with the display and ramfb options. At the point where it appears the guest is switching from ramfb to the vGPU display, the display goes black and QEMU reports:
qemu: eglCreateImageKHR failed This message occurs repeatedly. VM command line: /usr/local/bin/qemu-system-x86_64 \ -M pc \ -machine kernel_irqchip=on \ -accel kvm \ -cpu host \ -m 6G \ -smp 4,sockets=1,dies=1,cores=4,threads=1 \ -smbios 'type=0,vendor=HP,version=P02 Ver. 02.44,date=09/13/2022,release=2.44' \ -smbios 'type=1,manufacturer=HP,product=HP ProDesk 600 G3 MT,serial=MXL745130H,sku=Y3E02AV,family=103C_53307F HP ProDesk' \ -smbios 'type=2,manufacturer=HP,product=829D,version=KBC Version 06.29,serial=PFYUT0FCY9731K' \ -smbios type=3,manufacturer=HP,serial=MXL745130H,asset=MXL745130H \ -acpitable sig=SLIC,file=/var/lib/libvirt/images/slic.bin \ -acpitable sig=MSDM,file=/var/lib/libvirt/images/msdm.bin \ -global PIIX4_PM.disable_s3=1 \ -global PIIX4_PM.disable_s4=1 \ -rtc base=localtime,driftfix=slew \ -global kvm-pit.lost_tick_policy=delay \ -no-user-config \ -nodefaults \ -monitor stdio \ -serial none \ -parallel none \ -no-hpet \ -net nic,macaddr=5c:25:8e:a6:34:6e,model=virtio \ -net user \ -usb \ -usbdevice tablet \ -vga none \ -display gtk,gl=on \ -hda /var/lib/libvirt/images/win10-gvtg.qcow2 \ -device vfio-pci-nohotplug,sysfsdev=/sys/bus/mdev/devices/b1338b2d-a709-4c23-b766-cc436c36cdf0,display=on,ramfb=on,x-igd-opregion=on \ -snapshot Thanks, Alex On Mon, 17 Jul 2023 16:45:30 +0400 [email protected] wrote: > From: Dongwon Kim <[email protected]> > > Replace 'width' and 'height' in QemuDmaBuf with 'backing_widht' > and 'backing_height' as these commonly indicate the size of the > whole surface (e.g. guest's Xorg extended display). Then use > 'width' and 'height' for sub region in there (e.g. guest's > scanouts). > > Cc: Gerd Hoffmann <[email protected]> > Cc: Marc-André Lureau <[email protected]> > Cc: Vivek Kasireddy <[email protected]> > Signed-off-by: Dongwon Kim <[email protected]> > Reviewed-by: Marc-André Lureau <[email protected]> > Message-ID: <[email protected]> > --- > include/ui/console.h | 4 ++-- > hw/display/virtio-gpu-udmabuf.c | 12 ++++++------ > ui/dbus-listener.c | 8 ++++---- > ui/egl-helpers.c | 8 ++++---- > ui/gtk-egl.c | 10 ++++++---- > ui/gtk-gl-area.c | 7 ++++--- > 6 files changed, 26 insertions(+), 23 deletions(-) > > diff --git a/include/ui/console.h b/include/ui/console.h > index f27b2aad4f..3e8b22d6c6 100644 > --- a/include/ui/console.h > +++ b/include/ui/console.h > @@ -201,8 +201,8 @@ typedef struct QemuDmaBuf { > uint32_t texture; > uint32_t x; > uint32_t y; > - uint32_t scanout_width; > - uint32_t scanout_height; > + uint32_t backing_width; > + uint32_t backing_height; > bool y0_top; > void *sync; > int fence_fd; > diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabuf.c > index ef1a740de5..d51184d658 100644 > --- a/hw/display/virtio-gpu-udmabuf.c > +++ b/hw/display/virtio-gpu-udmabuf.c > @@ -181,13 +181,13 @@ static VGPUDMABuf > } > > dmabuf = g_new0(VGPUDMABuf, 1); > - dmabuf->buf.width = fb->width; > - dmabuf->buf.height = fb->height; > + 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.scanout_width = r->width; > - dmabuf->buf.scanout_height = r->height; > + 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; > @@ -218,8 +218,8 @@ int virtio_gpu_update_dmabuf(VirtIOGPU *g, > > g->dmabuf.primary[scanout_id] = new_primary; > qemu_console_resize(scanout->con, > - new_primary->buf.scanout_width, > - new_primary->buf.scanout_height); > + new_primary->buf.width, > + new_primary->buf.height); > dpy_gl_scanout_dmabuf(scanout->con, &new_primary->buf); > > if (old_primary) { > diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c > index 0240c39510..68ff343799 100644 > --- a/ui/dbus-listener.c > +++ b/ui/dbus-listener.c > @@ -415,13 +415,13 @@ static void dbus_scanout_texture(DisplayChangeListener > *dcl, > backing_width, backing_height, x, y, w, h); > #ifdef CONFIG_GBM > QemuDmaBuf dmabuf = { > - .width = backing_width, > - .height = backing_height, > + .width = w, > + .height = h, > .y0_top = backing_y_0_top, > .x = x, > .y = y, > - .scanout_width = w, > - .scanout_height = h, > + .backing_width = backing_width, > + .backing_height = backing_height, > }; > > assert(tex_id); > diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c > index 8f9fbf583e..3d19dbe382 100644 > --- a/ui/egl-helpers.c > +++ b/ui/egl-helpers.c > @@ -148,8 +148,8 @@ void egl_fb_blit(egl_fb *dst, egl_fb *src, bool flip) > if (src->dmabuf) { > x1 = src->dmabuf->x; > y1 = src->dmabuf->y; > - w = src->dmabuf->scanout_width; > - h = src->dmabuf->scanout_height; > + w = src->dmabuf->width; > + h = src->dmabuf->height; > } > > w = (x1 + w) > src->width ? src->width - x1 : w; > @@ -314,9 +314,9 @@ void egl_dmabuf_import_texture(QemuDmaBuf *dmabuf) > } > > attrs[i++] = EGL_WIDTH; > - attrs[i++] = dmabuf->width; > + attrs[i++] = dmabuf->backing_width; > attrs[i++] = EGL_HEIGHT; > - attrs[i++] = dmabuf->height; > + attrs[i++] = dmabuf->backing_height; > attrs[i++] = EGL_LINUX_DRM_FOURCC_EXT; > attrs[i++] = dmabuf->fourcc; > > diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c > index 42db1bb6cf..eee821d73a 100644 > --- a/ui/gtk-egl.c > +++ b/ui/gtk-egl.c > @@ -262,9 +262,10 @@ void gd_egl_scanout_dmabuf(DisplayChangeListener *dcl, > } > > gd_egl_scanout_texture(dcl, dmabuf->texture, > - dmabuf->y0_top, dmabuf->width, dmabuf->height, > - dmabuf->x, dmabuf->y, dmabuf->scanout_width, > - dmabuf->scanout_height, NULL); > + dmabuf->y0_top, > + dmabuf->backing_width, dmabuf->backing_height, > + dmabuf->x, dmabuf->y, dmabuf->width, > + dmabuf->height, NULL); > > if (dmabuf->allow_fences) { > vc->gfx.guest_fb.dmabuf = dmabuf; > @@ -284,7 +285,8 @@ void gd_egl_cursor_dmabuf(DisplayChangeListener *dcl, > if (!dmabuf->texture) { > return; > } > - egl_fb_setup_for_tex(&vc->gfx.cursor_fb, dmabuf->width, > dmabuf->height, > + egl_fb_setup_for_tex(&vc->gfx.cursor_fb, > + dmabuf->backing_width, dmabuf->backing_height, > dmabuf->texture, false); > } else { > egl_fb_destroy(&vc->gfx.cursor_fb); > diff --git a/ui/gtk-gl-area.c b/ui/gtk-gl-area.c > index a9a7fdf50c..4513d3d059 100644 > --- a/ui/gtk-gl-area.c > +++ b/ui/gtk-gl-area.c > @@ -301,9 +301,10 @@ void gd_gl_area_scanout_dmabuf(DisplayChangeListener > *dcl, > } > > gd_gl_area_scanout_texture(dcl, dmabuf->texture, > - dmabuf->y0_top, dmabuf->width, dmabuf->height, > - dmabuf->x, dmabuf->y, dmabuf->scanout_width, > - dmabuf->scanout_height, NULL); > + dmabuf->y0_top, > + dmabuf->backing_width, dmabuf->backing_height, > + dmabuf->x, dmabuf->y, dmabuf->width, > + dmabuf->height, NULL); > > if (dmabuf->allow_fences) { > vc->gfx.guest_fb.dmabuf = dmabuf;
