Changeset 34129 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Nov 16, 2010 10:31:39 PM (14 years ago)

Author:

vboxsync

Message:

2d: fix save state deadlock (xtracker#5335)

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (2 diffs)
• DevVGA.h (modified) (1 diff)
• DevVGA_VBVA.cpp (modified) (3 diffs)

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

@@ -5220 +5220 @@
 }
 
+static DECLCALLBACK(int) vgaR3SaveDone(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
+{
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    return vboxVBVASaveStateDone(pDevIns, pSSM);
+#else
+    return VINF_SUCCESS;
+#endif
+}
 
 /**
@@ -6007 +6015 @@
     rc = PDMDevHlpSSMRegisterEx(pDevIns, VGA_SAVEDSTATE_VERSION, sizeof(*pThis), NULL,
                                 NULL,          vgaR3LiveExec, NULL,
-                                vgaR3SavePrep, vgaR3SaveExec, NULL,
+                                vgaR3SavePrep, vgaR3SaveExec, vgaR3SaveDone,
                                 NULL,          vgaR3LoadExec, vgaR3LoadDone);
     if (RT_FAILURE(rc))

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

@@ -529 +529 @@
 int vbvaVHWACommandCompleteAsynch(PPDMIDISPLAYVBVACALLBACKS pInterface, PVBOXVHWACMD pCmd);
 int vbvaVHWAConstruct (PVGASTATE pVGAState);
-int vbvaVHWADisable (PVGASTATE pVGAState);
 int vbvaVHWAReset (PVGASTATE pVGAState);
 
 int vboxVBVASaveStatePrep (PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
+int vboxVBVASaveStateDone (PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
 # endif
 

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

@@ -1191 +1191 @@
 
 /* @todo call this also on reset? */
-int vbvaVHWADisable (PVGASTATE pVGAState)
-{
-    VBOXVHWACMD *pCmd = vbvaVHWAHHCommandCreate(pVGAState, VBOXVHWACMD_TYPE_DISABLE, 0, 0);
+int vbvaVHWAEnable (PVGASTATE pVGAState, bool bEnable)
+{
+    const VBOXVHWACMD_TYPE enmType = bEnable ? VBOXVHWACMD_TYPE_HH_ENABLE : VBOXVHWACMD_TYPE_HH_DISABLE;
+    VBOXVHWACMD *pCmd = vbvaVHWAHHCommandCreate(pVGAState,
+                        enmType,
+                    0, 0);
     Assert(pCmd);
     if(pCmd)
@@ -1220 +1223 @@
             if (iDisplay >= pVGAState->cMonitors)
                 break;
-            vbvaVHWAHHCommandReinit(pCmd, VBOXVHWACMD_TYPE_DISABLE, (int32_t)iDisplay);
+            vbvaVHWAHHCommandReinit(pCmd, enmType, (int32_t)iDisplay);
 
         } while (true);
@@ -1234 +1237 @@
 {
     /* ensure we have no pending commands */
-    return vbvaVHWADisable(PDMINS_2_DATA(pDevIns, PVGASTATE));
+    return vbvaVHWAEnable(PDMINS_2_DATA(pDevIns, PVGASTATE), false);
+}
+
+int vboxVBVASaveStateDone (PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
+{
+    /* ensure we have no pending commands */
+    return vbvaVHWAEnable(PDMINS_2_DATA(pDevIns, PVGASTATE), true);
 }