Changeset 34188 in vbox for trunk

Timestamp:

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

Author:

vboxsync

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

67925

Message:

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

Location:

trunk/src/VBox

Files:

• Devices/Graphics/DevVGA.cpp (modified) (2 diffs)
• Devices/Graphics/DevVGA.h (modified) (1 diff)
• Devices/Graphics/DevVGA_VBVA.cpp (modified) (2 diffs)
• Devices/Graphics/DevVGA_VDMA.cpp (modified) (11 diffs)
• Main/DisplayImpl.cpp (modified) (1 diff)

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

@@ -5235 +5235 @@
 {
     PVGASTATE pThis = PDMINS_2_DATA(pDevIns, PVGASTATE);
+#ifdef VBOX_WITH_VDMA
+    vboxVDMASaveStateExecPrep(pThis->pVdma, pSSM);
+#endif
     vgaR3SaveConfig(pThis, pSSM);
     vga_save(pSSM, PDMINS_2_DATA(pDevIns, PVGASTATE));
 #ifdef VBOX_WITH_HGSMI
     SSMR3PutBool(pSSM, true);
-    return vboxVBVASaveStateExec(pDevIns, pSSM);
+    int rc = vboxVBVASaveStateExec(pDevIns, pSSM);
+# ifdef VBOX_WITH_VDMA
+    vboxVDMASaveStateExecDone(pThis->pVdma, pSSM);
+# endif
+    return rc;
 #else
     SSMR3PutBool(pSSM, false);
@@ -6429 +6436 @@
     if(rc == VINF_SUCCESS)
     {
-        /* @todo: perhaps this should be done from some guest->host callback,
-        * that would as well specify the cmd pool size */
-        rc = vboxVDMAConstruct(pThis, &pThis->pVdma, 1024);
+        rc = vboxVDMAConstruct(pThis, 1024);
         AssertRC(rc);
     }

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

@@ -550 +550 @@
 # ifdef VBOX_WITH_VDMA
 typedef struct VBOXVDMAHOST *PVBOXVDMAHOST;
-int vboxVDMAConstruct(PVGASTATE pVGAState, struct VBOXVDMAHOST **ppVdma, uint32_t cPipeElements);
+int vboxVDMAConstruct(PVGASTATE pVGAState, uint32_t cPipeElements);
 int vboxVDMADestruct(PVBOXVDMAHOST pVdma);
 void vboxVDMAControl(PVBOXVDMAHOST pVdma, PVBOXVDMA_CTL pCmd);
 void vboxVDMACommand(PVBOXVDMAHOST pVdma, PVBOXVDMACBUF_DR pCmd);
-bool vboxVDMAIsEnabled(PVBOXVDMAHOST pVdma);
+int vboxVDMASaveStateExecPrep(struct VBOXVDMAHOST *pVdma, PSSMHANDLE pSSM);
+int vboxVDMASaveStateExecDone(struct VBOXVDMAHOST *pVdma, PSSMHANDLE pSSM);
 # endif /* VBOX_WITH_VDMA */
 

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

@@ -1321 +1321 @@
             }
 
+#ifdef VBOX_WITH_WDDM
+            /* Size of some additional data. For future extensions. */
+            rc = SSMR3PutU32 (pSSM, 4);
+            AssertRCReturn(rc, rc);
+            rc = SSMR3PutU32 (pSSM, pVGAState->fGuestCaps);
+            AssertRCReturn(rc, rc);
+#else
             /* Size of some additional data. For future extensions. */
             rc = SSMR3PutU32 (pSSM, 0);
             AssertRCReturn(rc, rc);
+#endif
         }
     }
@@ -1520 +1528 @@
                 rc = SSMR3GetU32 (pSSM, &cbExtra);
                 AssertRCReturn(rc, rc);
+#ifdef VBOX_WITH_WDDM
+                if (cbExtra >= 4)
+                {
+                    rc = SSMR3GetU32 (pSSM, &pVGAState->fGuestCaps);
+                    AssertRCReturn(rc, rc);
+                    cbExtra -= 4;
+                }
+#endif
                 if (cbExtra > 0)
                 {

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;
-}

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -2901 +2901 @@
         rc = pVMMDev->hgcmHostSvcHandleCreate("VBoxSharedCrOpenGL", &mhCrOglSvc);
 
-    if (RT_FAILURE(rc))
+    if (RT_SUCCESS(rc))
+    {
+        Assert(mhCrOglSvc);
+    }
+    else
     {
         mhCrOglSvc = NULL;