Changeset 26969 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport

Timestamp:

Mar 2, 2010 8:28:01 PM (15 years ago)

Author:

vboxsync

Message:

wddm: bugfixes + stubs for DMA support in VGA device

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm

Files:

• VBoxVideoShgsmi.cpp (modified) (10 diffs)
• VBoxVideoVdma.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoShgsmi.cpp

@@ -28 +28 @@
 
 /* SHGSMI */
-
-DECLINLINE(uint8_t *) vboxSHGSMIBufferData (const PVBOXSHGSMIHEADER pHeader)
-{
-    return (uint8_t *)pHeader + sizeof (VBOXSHGSMIHEADER);
-}
-
-DECLINLINE(PVBOXSHGSMIHEADER) vboxSHGSMIBufferHeader (const void *pvData)
-{
-    return (PVBOXSHGSMIHEADER)((uint8_t *)pvData - sizeof (VBOXSHGSMIHEADER));
-}
-
 DECLINLINE(void) vboxSHGSMICommandRetain (PVBOXSHGSMIHEADER pCmd)
 {
@@ -64 +53 @@
 DECLCALLBACK(void) vboxSHGSMICompletionCommandRelease(struct _HGSMIHEAP * pHeap, void *pvCmd, void *pvContext)
 {
-    vboxSHGSMICommandRelease (pHeap, vboxSHGSMIBufferHeader(pvCmd));
+    vboxSHGSMICommandRelease (pHeap, VBoxSHGSMIBufferHeader(pvCmd));
 }
 
@@ -88 +77 @@
     {
         PFNVBOXSHGSMICMDCOMPLETION pfnCompletion = (PFNVBOXSHGSMICMDCOMPLETION)pHeader->u64Info1;
-        pfnCompletion(pHeap, vboxSHGSMIBufferData (pHeader), (PVOID)pHeader->u64Info2);
+        pfnCompletion(pHeap, VBoxSHGSMIBufferData (pHeader), (PVOID)pHeader->u64Info2);
     }
 
@@ -97 +86 @@
 void VBoxSHGSMICommandSubmitAsynchEvent (struct _HGSMIHEAP * pHeap, PVOID pvBuff, RTSEMEVENT hEventSem)
 {
-    PVBOXSHGSMIHEADER pHeader = vboxSHGSMIBufferHeader (pvBuff);
+    PVBOXSHGSMIHEADER pHeader = VBoxSHGSMIBufferHeader (pvBuff);
     pHeader->u64Info1 = (uint64_t)vboxSHGSMICompletionSetEvent;
     pHeader->u64Info2 = (uint64_t)hEventSem;
@@ -125 +114 @@
 {
     fFlags &= ~VBOXSHGSMI_FLAG_GH_ASYNCH_CALLBACK_IRQ;
-    PVBOXSHGSMIHEADER pHeader = vboxSHGSMIBufferHeader (pvBuff);
+    PVBOXSHGSMIHEADER pHeader = VBoxSHGSMIBufferHeader (pvBuff);
     pHeader->u64Info1 = (uint64_t)pfnCompletion;
     pHeader->u64Info2 = (uint64_t)pvCompletion;
@@ -136 +125 @@
 {
     fFlags |= VBOXSHGSMI_FLAG_GH_ASYNCH_CALLBACK_IRQ | VBOXSHGSMI_FLAG_GH_ASYNCH_IRQ;
-    PVBOXSHGSMIHEADER pHeader = vboxSHGSMIBufferHeader (pvBuff);
+    PVBOXSHGSMIHEADER pHeader = VBoxSHGSMIBufferHeader (pvBuff);
     pHeader->u64Info1 = (uint64_t)pfnCompletion;
     pHeader->u64Info2 = (uint64_t)pvCompletion;
+    /* we must assign rather than or because flags field does not get zeroed on command creation */
     pHeader->fFlags = fFlags;
 
@@ -150 +140 @@
     Assert(pHeader);
     if (pHeader)
-        return vboxSHGSMIBufferData(pHeader);
+    {
+        pHeader->cRefs = 1;
+        return VBoxSHGSMIBufferData(pHeader);
+    }
     return NULL;
 }
@@ -156 +149 @@
 void VBoxSHGSMICommandFree (struct _HGSMIHEAP * pHeap, void *pvBuffer)
 {
-    PVBOXSHGSMIHEADER pHeader = vboxSHGSMIBufferHeader(pvBuffer);
+    PVBOXSHGSMIHEADER pHeader = VBoxSHGSMIBufferHeader(pvBuffer);
     vboxSHGSMICommandRelease (pHeap, pHeader);
 }
@@ -204 +197 @@
                 void *pvCallback = (void*)pCur->u64Info2;
 
-                pfnCallback(pHeap, vboxSHGSMIBufferData(pCur), pvCallback, &pfnCompletion, &pvCompletion);
+                pfnCallback(pHeap, VBoxSHGSMIBufferData(pCur), pvCallback, &pfnCompletion, &pvCompletion);
                 if (pfnCompletion)
                 {
@@ -222 +215 @@
                 PFNVBOXSHGSMICMDCOMPLETION pfnCallback = (PFNVBOXSHGSMICMDCOMPLETION)pCur->u64Info1;
                 void *pvCallback = (void*)pCur->u64Info2;
-                pfnCallback(pHeap, vboxSHGSMIBufferData(pCur), pvCallback);
+                pfnCallback(pHeap, VBoxSHGSMIBufferData(pCur), pvCallback);
             }
             else

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVdma.cpp

@@ -30 +30 @@
 
 
-static int vboxVdmaInformHost (PDEVICE_EXTENSION pDevExt, PVBOXVDMAINFO pInfo, uint32_t fFlags)
+static int vboxVdmaInformHost (PDEVICE_EXTENSION pDevExt, PVBOXVDMAINFO pInfo, VBOXVDMA_CTL_TYPE enmCtl)
 {
     int rc = VINF_SUCCESS;
@@ -37 +37 @@
     if (pCmd)
     {
-        pCmd->u32Flags = fFlags;
+        pCmd->enmCtl = enmCtl;
         pCmd->u32Offset = pInfo->CmdHeap.area.offBase;
         pCmd->i32Result = VERR_NOT_SUPPORTED;
@@ -51 +51 @@
     {
         drprintf((__FUNCTION__": HGSMIHeapAlloc failed\n"));
-        rc = VERR_GENERAL_FAILURE;
+        rc = VERR_OUT_OF_RESOURCES;
     }
 
@@ -115 +115 @@
     pInfo->fEnabled        = FALSE;
 
-    int rc = vboxVdmaInformHost (pDevExt, pInfo, VBOXVDMA_CTL_DISABLE);
+    int rc = vboxVdmaInformHost (pDevExt, pInfo, VBOXVDMA_CTL_TYPE_DISABLE);
     AssertRC(rc);
     return rc;
@@ -128 +128 @@
         return VINF_ALREADY_INITIALIZED;
 
-    int rc = vboxVdmaInformHost (pDevExt, pInfo, VBOXVDMA_CTL_ENABLE);
+    int rc = vboxVdmaInformHost (pDevExt, pInfo, VBOXVDMA_CTL_TYPE_ENABLE);
     Assert(RT_SUCCESS(rc));
     if (RT_SUCCESS(rc))
@@ -144 +144 @@
         return VINF_ALREADY_INITIALIZED;
 
-    int rc = vboxVdmaInformHost (pDevExt, pInfo, VBOXVDMA_CTL_FLUSH);
+    int rc = vboxVdmaInformHost (pDevExt, pInfo, VBOXVDMA_CTL_TYPE_FLUSH);
     Assert(RT_SUCCESS(rc));