Changeset 84802 in vbox

Timestamp:

Jun 11, 2020 10:44:48 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

138607

Message:

Devices/Graphics: experimental GLX graphics output: reset screens on power off

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA.cpp (modified) (2 diffs)
• DevVGA-SVGA.h (modified) (1 diff)
• DevVGA.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

@@ -3106 +3106 @@
             Log(("vmsvgaR3FifoLoop: reset the fifo thread.\n"));
             Assert(pThisCC->svga.pvFIFOExtCmdParam == NULL);
+
+            vmsvgaR3ResetScreens(pThisCC);
 # ifdef VBOX_WITH_VMSVGA3D
             if (pThis->svga.f3DEnabled)
             {
                 /* The 3d subsystem must be reset from the fifo thread. */
-                vmsvgaR3ResetScreens(pThisCC); /** @todo Also destroy screens on PowerOff. */
                 vmsvga3dReset(pThisCC);
             }
 # endif
+            break;
+
+        case VMSVGA_FIFO_EXTCMD_POWEROFF:
+            Log(("vmsvgaR3FifoLoop: power off.\n"));
+            Assert(pThisCC->svga.pvFIFOExtCmdParam == NULL);
+
+            /* The screens must be reset on the FIFO thread, because they may use 3D resources. */
+            vmsvgaR3ResetScreens(pThisCC);
             break;
 
@@ -6918 +6927 @@
 }
 
+/**
+ * Power Off notification.
+ *
+ * @param   pDevIns     The device instance data.
+ *
+ * @remarks Caller enters the device critical section.
+ */
+DECLCALLBACK(void) vmsvgaR3PowerOff(PPDMDEVINS pDevIns)
+{
+    PVGASTATE   pThis   = PDMDEVINS_2_DATA(pDevIns, PVGASTATE);
+    PVGASTATECC pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PVGASTATECC);
+
+    /*
+     * Notify the FIFO thread.
+     */
+    if (pThisCC->svga.pFIFOIOThread)
+    {
+        int rc = vmsvgaR3RunExtCmdOnFifoThread(pDevIns, pThis, pThisCC,  VMSVGA_FIFO_EXTCMD_POWEROFF,
+                                               NULL /*pvParam*/, 30000 /*ms*/);
+        AssertLogRelRC(rc);
+    }
+}
+
 #endif /* IN_RING3 */

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.h

@@ -72 +72 @@
 #define VMSVGA_FIFO_EXTCMD_RESET                        4
 #define VMSVGA_FIFO_EXTCMD_UPDATE_SURFACE_HEAP_BUFFERS  5
+#define VMSVGA_FIFO_EXTCMD_POWEROFF                     6
 
 /** Size of the region to backup when switching into svga mode. */

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -6180 +6180 @@
 # endif
     VBVAOnResume(pDevIns, pThis, pThisCC);
+}
+
+
+/**
+ * @interface_method_impl{PDMDEVREG,pfnPowerOff}
+ */
+static DECLCALLBACK(void) vgaR3PowerOff(PPDMDEVINS pDevIns)
+{
+    PVGASTATE   pThis = PDMDEVINS_2_DATA(pDevIns, PVGASTATE);
+    PVGASTATECC pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PVGASTATECC);
+    RT_NOREF(pThis, pThisCC);
+# ifdef VBOX_WITH_VMSVGA
+    vmsvgaR3PowerOff(pDevIns);
+# endif
 }
 
@@ -7439 +7453 @@
     /* .pfnQueryInterface = */      NULL,
     /* .pfnInitComplete = */        NULL,
-    /* .pfnPowerOff = */            NULL,
+    /* .pfnPowerOff = */            vgaR3PowerOff,
     /* .pfnSoftReset = */           NULL,
     /* .pfnReserved0 = */           NULL,