Changeset 34188 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp

Timestamp:

Nov 18, 2010 9:47:50 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: saved state working for Aero (current frame still needs to be saved)

File:

• trunk/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp (modified) (11 diffs)

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

@@ -83 +83 @@
     PHGSMIINSTANCE pHgsmi;
     PVGASTATE pVGAState;
-    bool bEnabled;
 #ifdef VBOX_VDMA_WITH_WORKERTHREAD
     VBOXVDMAPIPE Pipe;
@@ -203 +202 @@
 }
 
-static int vboxVDMACrCtlHgsmiSetupAsync(struct VBOXVDMAHOST *pVdma)
+static int vboxVDMACrCtlHgsmiSetup(struct VBOXVDMAHOST *pVdma)
 {
     PVBOXVDMACMD_CHROMIUM_CTL_CRHGSMI_SETUP pCmd = (PVBOXVDMACMD_CHROMIUM_CTL_CRHGSMI_SETUP)vboxVDMACrCtlCreate(
@@ -211 +210 @@
         PVGASTATE pVGAState = pVdma->pVGAState;
         pCmd->pvRamBase = pVGAState->vram_ptrR3;
-        int rc = vboxVDMACrCtlPostAsync(pVGAState, &pCmd->Hdr, vboxVDMACrCtlCbReleaseCmd, NULL);
-#ifdef DEBUG_misha
+        int rc = vboxVDMACrCtlPost(pVGAState, &pCmd->Hdr);
         AssertRC(rc);
-#endif
-#if 0
         if (RT_SUCCESS(rc))
         {
@@ -221 +217 @@
         }
         vboxVDMACrCtlRelease(&pCmd->Hdr);
-#endif
         return rc;
     }
@@ -1072 +1067 @@
 #endif
 
-int vboxVDMAConstruct(PVGASTATE pVGAState, struct VBOXVDMAHOST **ppVdma, uint32_t cPipeElements)
+int vboxVDMAConstruct(PVGASTATE pVGAState, uint32_t cPipeElements)
 {
     int rc;
@@ -1108 +1103 @@
 # endif
 #endif
-                *ppVdma = pVdma;
+                pVGAState->pVdma = pVdma;
+#ifdef VBOX_WITH_CRHGSMI
+                rc = vboxVDMACrCtlHgsmiSetup(pVdma);
+# ifdef DEBUG_misha
+                AssertRC(rc);
+# endif
+#endif
                 return VINF_SUCCESS;
 #ifdef VBOX_VDMA_WITH_WORKERTHREAD
@@ -1168 +1169 @@
 int vboxVDMASaveStateExecPrep(struct VBOXVDMAHOST *pVdma, PSSMHANDLE pSSM)
 {
+#ifdef VBOX_WITH_CRHGSMI
     PVGASTATE pVGAState = pVdma->pVGAState;
     PVBOXVDMACMD_CHROMIUM_CTL pCmd = (PVBOXVDMACMD_CHROMIUM_CTL)vboxVDMACrCtlCreate(
@@ -1176 +1178 @@
         int rc = vboxVDMACrCtlPost(pVGAState, pCmd);
         AssertRC(rc);
+        if (RT_SUCCESS(rc))
+        {
+            rc = vboxVDMACrCtlGetRc(pCmd);
+        }
+        vboxVDMACrCtlRelease(pCmd);
         return rc;
     }
     return VERR_NO_MEMORY;
+#else
+    return VINF_SUCCESS;
+#endif
 }
 
 int vboxVDMASaveStateExecDone(struct VBOXVDMAHOST *pVdma, PSSMHANDLE pSSM)
 {
+#ifdef VBOX_WITH_CRHGSMI
     PVGASTATE pVGAState = pVdma->pVGAState;
     PVBOXVDMACMD_CHROMIUM_CTL pCmd = (PVBOXVDMACMD_CHROMIUM_CTL)vboxVDMACrCtlCreate(
@@ -1191 +1202 @@
         int rc = vboxVDMACrCtlPost(pVGAState, pCmd);
         AssertRC(rc);
+        if (RT_SUCCESS(rc))
+        {
+            rc = vboxVDMACrCtlGetRc(pCmd);
+        }
+        vboxVDMACrCtlRelease(pCmd);
         return rc;
     }
     return VERR_NO_MEMORY;
+#else
+    return VINF_SUCCESS;
+#endif
 }
 
@@ -1205 +1224 @@
     {
         case VBOXVDMA_CTL_TYPE_ENABLE:
-        {
-            pVdma->bEnabled = true;
             pCmd->i32Result = VINF_SUCCESS;
-#ifdef VBOX_WITH_CRHGSMI
-            /* @todo: use async completion to ensure we notify a status to guest */
-            int tmpRc = vboxVDMACrCtlHgsmiSetupAsync(pVdma);
-            AssertRC(tmpRc);
-#endif
-        }
             break;
         case VBOXVDMA_CTL_TYPE_DISABLE:
-            pVdma->bEnabled = false;
             pCmd->i32Result = VINF_SUCCESS;
             break;
@@ -1299 +1309 @@
     AssertRC(tmpRc);
 }
-
-bool vboxVDMAIsEnabled(PVBOXVDMAHOST pVdma)
-{
-    return pVdma->bEnabled;
-}