[v3,2/2] ui: introduce vfio_display_reset

Submitted by Zhang, Tina on April 26, 2018, 8:21 a.m.

Details

Message ID 1524730880-7154-3-git-send-email-tina.zhang@intel.com
State New
Headers show
Series "Add vfio dma-buf based display reset handling" ( rev: 1 ) in Intel GVT devel

Not browsing as part of any series.

Commit Message

Zhang, Tina April 26, 2018, 8:21 a.m.
During guest OS reboot, guest framebuffer is invalid. It will cause
bugs, if the invalid guest framebuffer is still used by host.

This patch is to introduce vfio_display_reset which is invoked
during vfio display reset. This vfio_display_reset function is used
to release the invalid display resource, disable scanout mode and
replace the invalid surface with QemuConsole's DisplaySurafce.

This patch can fix the GPU hang issue caused by gd_egl_draw during
guest OS reboot.

Changes v2->v3:
 - Limit vfio_display_reset to dma-buf based vfio display. (Gerd)

Changes v1->v2:
 - Use dpy_gfx_update_full() update screen after reset. (Gerd)
 - Remove dpy_gfx_switch_surface(). (Gerd)

Signed-off-by: Tina Zhang <tina.zhang@intel.com>
---
 hw/vfio/display.c | 10 ++++++++++
 hw/vfio/pci.c     |  7 +++++++
 hw/vfio/pci.h     |  1 +
 3 files changed, 18 insertions(+)

Patch hide | download patch | download mbox

diff --git a/hw/vfio/display.c b/hw/vfio/display.c
index 7d727ce..dc4b1e9 100644
--- a/hw/vfio/display.c
+++ b/hw/vfio/display.c
@@ -198,6 +198,16 @@  static void vfio_display_dmabuf_exit(VFIODisplay *dpy)
 }
 
 /* ---------------------------------------------------------------------- */
+void vfio_display_reset(VFIOPCIDevice *vdev)
+{
+    if (!vdev || !vdev->dpy || !vdev->dpy->con) {
+        return;
+    }
+
+    dpy_gl_scanout_disable(vdev->dpy->con);
+    vfio_display_dmabuf_exit(vdev->dpy);
+    dpy_gfx_update_full(vdev->dpy->con);
+}
 
 static void vfio_display_region_update(void *opaque)
 {
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index b9bc6cd..648b29d 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -3098,11 +3098,18 @@  static void vfio_pci_reset(DeviceState *dev)
 {
     PCIDevice *pdev = DO_UPCAST(PCIDevice, qdev, dev);
     VFIOPCIDevice *vdev = DO_UPCAST(VFIOPCIDevice, pdev, pdev);
+    VFIODisplay *dpy = vdev->dpy;
 
     trace_vfio_pci_reset(vdev->vbasedev.name);
 
     vfio_pci_pre_reset(vdev);
 
+    /* vfio_display_reset is needed by dma-buf based vfio display */
+    if (vdev->display != ON_OFF_AUTO_OFF && dpy &&
+        dpy->dmabuf.primary) {
+        vfio_display_reset(vdev);
+    }
+
     if (vdev->resetfn && !vdev->resetfn(vdev)) {
         goto post_reset;
     }
diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
index 629c875..59ab775 100644
--- a/hw/vfio/pci.h
+++ b/hw/vfio/pci.h
@@ -176,6 +176,7 @@  int vfio_pci_igd_opregion_init(VFIOPCIDevice *vdev,
                                struct vfio_region_info *info,
                                Error **errp);
 
+void vfio_display_reset(VFIOPCIDevice *vdev);
 int vfio_display_probe(VFIOPCIDevice *vdev, Error **errp);
 void vfio_display_finalize(VFIOPCIDevice *vdev);
 

Comments

>  /* ---------------------------------------------------------------------- */
> +void vfio_display_reset(VFIOPCIDevice *vdev)
> +{
> +    if (!vdev || !vdev->dpy || !vdev->dpy->con) {
> +        return;
> +    }
> +
> +    dpy_gl_scanout_disable(vdev->dpy->con);
> +    vfio_display_dmabuf_exit(vdev->dpy);
> +    dpy_gfx_update_full(vdev->dpy->con);
> +}

> +    /* vfio_display_reset is needed by dma-buf based vfio display */
> +    if (vdev->display != ON_OFF_AUTO_OFF && dpy &&
> +        dpy->dmabuf.primary) {

Well, the check should be inside the vfio_display_reset() function, so
the display specific code is contained to display.c.

cheers,
  Gerd