Changeset 83374 in vbox

Timestamp:

Mar 23, 2020 5:14:57 PM (5 years ago)

Author:

vboxsync

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

136582

Message:

VMSVGA: Check for mode changes from the outer FIFO loop as well, so that mode changes don't depend on FIFO commands being sent (see bugref:9424).

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp (modified) (5 diffs)

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

@@ -3560 +3560 @@
 
 
+/**
+ * Called by the FIFO thread to process pending actions.
+ *
+ * @param   pDevIns     The device instance.
+ * @param   pThis       The shared VGA/VMSVGA instance data.
+ * @param   pThisCC     The VGA/VMSVGA state for ring-3.
+ */
+void vmsvgaR3FifoPendingActions(PPDMDEVINS pDevIns, PVGASTATE pThis, PVGASTATECC pThisCC)
+{
+    RT_NOREF(pDevIns);
+
+    /* Currently just mode changes. */
+    if (ASMBitTestAndClear(&pThis->svga.u32ActionFlags, VMSVGA_ACTION_CHANGEMODE_BIT))
+    {
+        vmsvgaR3ChangeMode(pThis, pThisCC);
+# ifdef VBOX_WITH_VMSVGA3D
+        if (pThisCC->svga.p3dState != NULL)
+            vmsvga3dChangeMode(pThisCC);
+# endif
+    }
+}
+
+
 /*
  * These two macros are put outside vmsvgaR3FifoLoop because doxygen gets confused,
@@ -3686 +3709 @@
             vmsvga3dCocoaServiceRunLoop();
 # endif
+
+        /* First check any pending actions. */
+        vmsvgaR3FifoPendingActions(pDevIns, pThis, pThisCC);
 
         /*
@@ -3835 +3861 @@
 
             /* First check any pending actions. */
-            if (ASMBitTestAndClear(&pThis->svga.u32ActionFlags, VMSVGA_ACTION_CHANGEMODE_BIT))
-            {
-                vmsvgaR3ChangeMode(pThis, pThisCC);
-# ifdef VBOX_WITH_VMSVGA3D
-                if (pThisCC->svga.p3dState != NULL)
-                    vmsvga3dChangeMode(pThisCC);
-# endif
-            }
+            vmsvgaR3FifoPendingActions(pDevIns, pThis, pThisCC);
 
             /* Check for pending external commands (reset). */
@@ -6014 +6033 @@
     PVMSVGAR3STATE  pSVGAState = pThisCC->svga.pSvgaR3State;
 
-    ASMAtomicOrU32(&pThis->svga.u32ActionFlags, VMSVGA_ACTION_CHANGEMODE);
-
     /* Set the active cursor. */
     if (pSVGAState->Cursor.fActive)
@@ -6045 +6062 @@
         vgaR3UnregisterVRAMHandler(pDevIns, pThis);
     }
+
+    /* Let the FIFO thread deal with changing the mode. */
+    ASMAtomicOrU32(&pThis->svga.u32ActionFlags, VMSVGA_ACTION_CHANGEMODE);
 
     return VINF_SUCCESS;