Changeset 51357 in vbox

Timestamp:

May 22, 2014 5:11:17 PM (11 years ago)

Author:

vboxsync

Message:

wddm/crOpenGL/DevVGA: CmdVbva disable fixes

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVbva.cpp (modified) (1 diff)
• Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (1 diff)
• Devices/Graphics/DevVGA.cpp (modified) (1 diff)
• Devices/Graphics/DevVGA_VDMA.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVbva.cpp

@@ -278 +278 @@
     LogFlowFunc(("\n"));
 
+    vboxVBVAExCtlSubmitEnableDisable(pCtx, pHGSMICtx, false);
+
     pCtx->fHwBufferOverflow = false;
     pCtx->pRecord           = NULL;
     pCtx->pVBVA             = NULL;
-
-    vboxVBVAExCtlSubmitEnableDisable(pCtx, pHGSMICtx, false);
 
     return;

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -968 +968 @@
         VBoxMPCmnUnmapAdapterMemory(VBoxCommonFromDeviceExt(pDevExt), (void**)&pDevExt->pvVisibleVram);
 
-    for (int i = VBoxCommonFromDeviceExt(pDevExt)->cDisplays-1; i >= 0; --i)
-    {
-        rc = vboxVbvaDisable(pDevExt, &pDevExt->aSources[i].Vbva);
+    if (pDevExt->fCmdVbvaEnabled)
+    {
+        rc = VBoxCmdVbvaDisable(pDevExt, &pDevExt->CmdVbva);
+        if (RT_SUCCESS(rc))
+        {
+            rc = VBoxCmdVbvaDestroy(pDevExt, &pDevExt->CmdVbva);
+            if (RT_FAILURE(rc))
+                WARN(("VBoxCmdVbvaDestroy failed %d", rc));
+        }
+        else
+            WARN(("VBoxCmdVbvaDestroy failed %d", rc));
+
+    }
+    else
+    {
+        for (int i = VBoxCommonFromDeviceExt(pDevExt)->cDisplays-1; i >= 0; --i)
+        {
+            rc = vboxVbvaDisable(pDevExt, &pDevExt->aSources[i].Vbva);
+            AssertRC(rc);
+            if (RT_SUCCESS(rc))
+            {
+                rc = vboxVbvaDestroy(pDevExt, &pDevExt->aSources[i].Vbva);
+                AssertRC(rc);
+                if (RT_FAILURE(rc))
+                {
+                    /* @todo: */
+                }
+            }
+        }
+
+        vboxVideoAMgrDestroy(pDevExt, &pDevExt->AllocMgr);
+
+        rc = vboxVdmaDisable(pDevExt, &pDevExt->u.primary.Vdma);
         AssertRC(rc);
         if (RT_SUCCESS(rc))
         {
-            rc = vboxVbvaDestroy(pDevExt, &pDevExt->aSources[i].Vbva);
+#ifdef VBOX_VDMA_WITH_WATCHDOG
+            vboxWddmWdTerm(pDevExt);
+#endif
+            rc = vboxVdmaDestroy(pDevExt, &pDevExt->u.primary.Vdma);
             AssertRC(rc);
-            if (RT_FAILURE(rc))
-            {
-                /* @todo: */
-            }
-        }
-    }
-
-    vboxVideoAMgrDestroy(pDevExt, &pDevExt->AllocMgr);
-
-    rc = vboxVdmaDisable(pDevExt, &pDevExt->u.primary.Vdma);
-    AssertRC(rc);
-    if (RT_SUCCESS(rc))
-    {
-#ifdef VBOX_VDMA_WITH_WATCHDOG
-        vboxWddmWdTerm(pDevExt);
-#endif
-        rc = vboxVdmaDestroy(pDevExt, &pDevExt->u.primary.Vdma);
-        AssertRC(rc);
-    }
+        }
+    }
+
     return rc;
 }

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

@@ -4650 +4650 @@
 {
     PVGASTATE pThis = IDISPLAYPORT_2_VGASTATE(pInterface);
-    PDMDEV_ASSERT_EMT(VGASTATE2DEVINS(pThis));
+    /* this can be called from CmdVbva thread as a result of VBVA disable,
+     * there should be no problem with calling it from there afaics */
+//    PDMDEV_ASSERT_EMT(VGASTATE2DEVINS(pThis));
 
     /* This is called both in VBVA mode and normal modes. */

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

@@ -150 +150 @@
     VBVAEXHOST_DATA_TYPE_GUESTCTL
 } VBVAEXHOST_DATA_TYPE;
+
+static DECLCALLBACK(int) vdmaVBVANotifyDisable(PVGASTATE pVGAState);
+
+
 static VBVAEXHOST_DATA_TYPE VBoxVBVAExHPDataGet(struct VBVAEXHOSTCONTEXT *pCmdVbva, uint8_t **ppCmd, uint32_t *pcbCmd);
 
@@ -1280 +1284 @@
         if (fDoHgcmEnable)
         {
+            PVGASTATE pVGAState = pVdma->pVGAState;
+
             /* disable is a bit tricky
              * we need to ensure the host ctl commands do not come out of order
@@ -1285 +1291 @@
             rc = vboxVDMACrHgcmHandleEnable(pVdma);
             if (RT_SUCCESS(rc))
-                return rc;
-
-            PVGASTATE pVGAState = pVdma->pVGAState;
+            {
+                vdmaVBVANotifyDisable(pVGAState);
+                return VINF_SUCCESS;
+            }
+
             VBOXCRCMD_SVRENABLE_INFO Info;
             Info.hCltScr = pVGAState->pDrv;