vbox的更動 32241 路徑 trunk/src/VBox/Devices/Graphics/HGSMI

時間撮記:

2010-9-6 上午04:52:56 (14 年 以前)

作者:

vboxsync

訊息:

wddm: 1. guest installler integration (uninstall needs additional fixing), 2. dev/vga saved state fixes, 3. better split video dma and wddm 4. separate wddm wine libs, 5. etc.

位置:

trunk/src/VBox/Devices/Graphics/HGSMI

檔案:

• HGSMIHost.cpp (修改) (9 筆差異)
• HGSMIHost.h (修改) (1 筆差異)

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp

@@ -148 +148 @@
     HGSMILIST hostFIFOProcessed;       /* Processed by the guest. */
     HGSMILIST hostFIFOFree;            /* Buffers for reuse. */
-#ifdef VBOXVDMA
+#ifdef VBOXWDDM
     HGSMILIST guestCmdCompleted;       /* list of completed guest commands to be returned to the guest*/
 #endif
@@ -210 +210 @@
 static DECLCALLBACK(void) hgsmiHostCommandFreeCallback (void *pvCallback);
 
-#ifdef VBOXVDMA
+#ifdef VBOXWDDM
 
 typedef struct _HGSMIGUESTCOMPLENTRY
@@ -369 +369 @@
 }
 
+#ifdef VBOXWDDM
+static HGSMIOFFSET hgsmiProcessGuestCmdCompletion(HGSMIINSTANCE *pIns)
+{
+    HGSMIOFFSET offCmd = HGSMIOFFSET_VOID;
+    int rc = hgsmiFIFOLock(pIns);
+    AssertRC(rc);
+    if(RT_SUCCESS(rc))
+    {
+        /* Get the host FIFO head entry. */
+        HGSMILISTENTRY *pHead = pIns->guestCmdCompleted.pHead;
+        if(pHead)
+            hgsmiListRemove (&pIns->guestCmdCompleted, pHead, NULL);
+
+        if(!pIns->guestCmdCompleted.pHead)
+            pIns->pHGFlags->u32HostFlags &= (~HGSMIHOSTFLAGS_GCOMMAND_COMPLETED);
+
+        hgsmiFIFOUnlock(pIns);
+
+        if (pHead)
+        {
+            HGSMIGUESTCOMPLENTRY *pEntry = HGSMILISTENTRY_2_HGSMIGUESTCOMPLENTRY(pHead);
+            offCmd = pEntry->offBuffer;
+
+            LogFlowFunc(("host FIFO head %p.\n", pEntry));
+
+            hgsmiGuestCompletionFIFOFree (pIns, pEntry);
+        }
+    }
+    return offCmd;
+}
+#endif
+
+
 /* Called from HGSMI_IO_GUEST read handler. */
 HGSMIOFFSET HGSMIGuestRead (PHGSMIINSTANCE pIns)
@@ -378 +411 @@
     VM_ASSERT_EMT(pIns->pVM);
 
-#ifndef VBOXVDMA
+#ifndef VBOXWDDM
     /* Currently there is no functionality here. */
     NOREF(pIns);
@@ -386 +419 @@
     /* use this to speedup guest cmd completion
      * this mechanism is alternative to submitting H->G command for notification */
-    HGSMIOFFSET offCmd = HGSMIOFFSET_VOID;
-    int rc = hgsmiFIFOLock(pIns);
-    AssertRC(rc);
-    if(RT_SUCCESS(rc))
-    {
-        /* Get the host FIFO head entry. */
-        HGSMILISTENTRY *pHead = pIns->guestCmdCompleted.pHead;
-        if(pHead)
-            hgsmiListRemove (&pIns->guestCmdCompleted, pHead, NULL);
-
-        if(!pIns->guestCmdCompleted.pHead)
-            pIns->pHGFlags->u32HostFlags &= (~HGSMIHOSTFLAGS_GCOMMAND_COMPLETED);
-
-        hgsmiFIFOUnlock(pIns);
-
-        if (pHead)
-        {
-            HGSMIGUESTCOMPLENTRY *pEntry = HGSMILISTENTRY_2_HGSMIGUESTCOMPLENTRY(pHead);
-            offCmd = pEntry->offBuffer;
-
-            LogFlowFunc(("host FIFO head %p.\n", pEntry));
-
-            hgsmiGuestCompletionFIFOFree (pIns, pEntry);
-        }
-    }
-    /* Special value that means there is no host buffers to be processed. */
+    HGSMIOFFSET offCmd = hgsmiProcessGuestCmdCompletion(pIns);
     return offCmd;
 #endif
@@ -1248 +1256 @@
             rc = hgsmiHostSaveFifoLocked (&pIns->hostFIFORead, pSSM); AssertRC(rc);
             rc = hgsmiHostSaveFifoLocked (&pIns->hostFIFOProcessed, pSSM); AssertRC(rc);
+#ifdef VBOXWDDM
+            rc = hgsmiHostSaveFifoLocked (&pIns->guestCmdCompleted, pSSM); AssertRC(rc);
+#endif
 
             hgsmiFIFOUnlock (pIns);
@@ -1311 +1322 @@
                 if (RT_SUCCESS(rc))
                     rc = hgsmiHostLoadFifoLocked (pIns, &pIns->hostFIFOProcessed, pSSM);
+#ifdef VBOXWDDM
+                if (RT_SUCCESS(rc) && u32Version > VGA_SAVEDSTATE_VERSION_PRE_WDDM)
+                    rc = hgsmiHostLoadFifoLocked (pIns, &pIns->hostFIFOProcessed, pSSM);
+#endif
 
                 hgsmiFIFOUnlock (pIns);
@@ -1632 +1647 @@
     while(hgsmiProcessHostCmdCompletion (pIns, 0, true)) {}
 
+#ifdef VBOXWDDM
+    while(hgsmiProcessGuestCmdCompletion(pIns) != HGSMIOFFSET_VOID) {}
+#endif
+
     HGSMIHeapSetupUnitialized (&pIns->hostHeap);
 
@@ -1666 +1685 @@
 }
 
-#ifdef VBOXVDMA
+#ifdef VBOXWDDM
 
 static int hgsmiGuestCommandComplete (HGSMIINSTANCE *pIns, HGSMIOFFSET offMem)

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.h

@@ -132 +132 @@
 int HGSMIHostSaveStateExec (PHGSMIINSTANCE pIns, PSSMHANDLE pSSM);
 
-#ifdef VBOXVDMA
+#ifdef VBOXWDDM
 int HGSMICompleteGuestCommand(PHGSMIINSTANCE pIns, void *pvMem, bool bDoIrq);
 #endif