Changeset 22408 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 24, 2009 10:59:45 AM (15 years ago)

Author:

vboxsync

Message:

video hw accel: properly handle synch vhwa command completion

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Display

Files:

• dd.c (modified) (5 diffs)
• driver.h (modified) (1 diff)
• vbox.c (modified) (13 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Display/dd.c

@@ -701 +701 @@
                 }
             }
-            vboxVHWACommandFree(pDev, pCmd);
+            vbvaVHWACommandRelease(pDev, pCmd);
         }
         return DDHAL_DRIVER_NOTHANDLED;
@@ -830 +830 @@
                 lpCanCreateSurface->ddRVal = DDERR_GENERIC;
             }
-            vboxVHWACommandFree(pDev, pCmd);
+            vbvaVHWACommandRelease(pDev, pCmd);
         }
         else
@@ -1091 +1091 @@
                 /* wait for the surface to be locked and memory buffer updated */
                 vboxVHWACommandSubmit(pDev, pCmd);
-                vboxVHWACommandFree(pDev, pCmd);
+                vbvaVHWACommandRelease(pDev, pCmd);
                 vboxVHWARegionClear(&pDesc->NonupdatedMemRegion);
                 lpLock->ddRVal = DD_OK;
@@ -2507 +2507 @@
     ASMAtomicDecU32(&pDestDesc->cPendingBltsDst);
 
-    vboxVHWACommandFree(ppdev, pCmd);
+    vbvaVHWACommandRelease(ppdev, pCmd);
 }
 
@@ -2519 +2519 @@
     ASMAtomicDecU32(&pTargDesc->cPendingFlipsTarg);
 
-    vboxVHWACommandFree(ppdev, pCmd);
+    vbvaVHWACommandRelease(ppdev, pCmd);
 }
 

trunk/src/VBox/Additions/WINNT/Graphics/Display/driver.h

@@ -318 +318 @@
 VBOXVHWACMD* vboxVHWACommandCreate (PPDEV ppdev, VBOXVHWACMD_TYPE enmCmd, VBOXVHWACMD_LENGTH cbCmd);
 void vboxVHWACommandFree (PPDEV ppdev, VBOXVHWACMD* pCmd);
+DECLINLINE(void) vbvaVHWACommandRelease (PPDEV ppdev, VBOXVHWACMD* pCmd)
+{
+    uint32_t cRefs = ASMAtomicDecU32(&pCmd->cRefs);
+    Assert(cRefs < UINT32_MAX / 2);
+    if(!cRefs)
+    {
+        vboxVHWACommandFree(ppdev, pCmd);
+    }
+}
+
+DECLINLINE(void) vbvaVHWACommandRetain (PPDEV ppdev, VBOXVHWACMD* pCmd)
+{
+    ASMAtomicIncU32(&pCmd->cRefs);
+}
+
 BOOL vboxVHWACommandSubmit (PPDEV ppdev, VBOXVHWACMD* pCmd);
 void vboxVHWACommandSubmitAsynch (PPDEV ppdev, VBOXVHWACMD* pCmd, PFNVBOXVHWACMDCOMPLETION pfnCompletion, void * pContext);

trunk/src/VBox/Additions/WINNT/Graphics/Display/vbox.c

@@ -710 +710 @@
         pHdr->rc = VERR_GENERAL_FAILURE;
         pHdr->enmCmd = enmCmd;
+        pHdr->cRefs = 1;
     }
 
@@ -784 +785 @@
     pCmd->GuestVBVAReserved1 = (uintptr_t)pEvent;
     pCmd->GuestVBVAReserved2 = 0;
+    /* ensure the command is not removed until we're processing it */
+    vbvaVHWACommandRetain(ppdev, pCmd);
 
     /* complete it asynchronously by setting event */
     pCmd->Flags |= VBOXVHWACMD_FLAG_GH_ASYNCH_EVENT;
     vboxHGSMIBufferSubmit (ppdev, pCmd);
-    //TODO: dbg
-#if 0
+
     if(!(ASMAtomicReadU32((volatile uint32_t *)&pCmd->Flags)  & VBOXVHWACMD_FLAG_HG_ASYNCH))
     {
@@ -795 +797 @@
         EngSetEvent(pEvent);
     }
-#endif
+
+    vbvaVHWACommandRelease(ppdev, pCmd);
 }
 
@@ -827 +830 @@
     pCmd->GuestVBVAReserved1 = (uintptr_t)pfnCompletion;
     pCmd->GuestVBVAReserved2 = (uintptr_t)pContext;
+    vbvaVHWACommandRetain(ppdev, pCmd);
 
     vboxHGSMIBufferSubmit (ppdev, pCmd);
-    //TODO: dbg
-#if 0
+
     if(!(pCmd->Flags & VBOXVHWACMD_FLAG_HG_ASYNCH))
     {
@@ -836 +839 @@
         pfnCompletion(ppdev, pCmd, pContext);
     }
-#endif
+
+    vbvaVHWACommandRelease(ppdev, pCmd);
 }
 
 static DECLCALLBACK(void) vboxVHWAFreeCmdCompletion(PPDEV ppdev, VBOXVHWACMD * pCmd, void * pContext)
 {
-    vboxVHWACommandFree(ppdev, pCmd);
+    vbvaVHWACommandRelease(ppdev, pCmd);
 }
 
@@ -849 +853 @@
     pCmd->GuestVBVAReserved1 = (uintptr_t)vboxVHWAFreeCmdCompletion;
 
+    vbvaVHWACommandRetain(ppdev, pCmd);
+
     pCmd->Flags |= VBOXVHWACMD_FLAG_GH_ASYNCH_NOCOMPLETION;
 
     vboxHGSMIBufferSubmit (ppdev, pCmd);
-    //TODO: dbg
-#if 0
+
     if(!(pCmd->Flags & VBOXVHWACMD_FLAG_HG_ASYNCH)
             || pCmd->Flags & VBOXVHWACMD_FLAG_HG_ASYNCH_RETURNED)
@@ -860 +865 @@
         vboxVHWAFreeCmdCompletion(ppdev, pCmd, NULL);
     }
-#endif
+
+    vbvaVHWACommandRelease(ppdev, pCmd);
 }
 
@@ -866 +872 @@
 {
     VBOXVHWACMD* pCmd = VBOXVHWACMD_HEAD(pInfo);
-    vboxVHWACommandFree (ppdev, pCmd);
+    vbvaVHWACommandRelease (ppdev, pCmd);
 }
 
@@ -872 +878 @@
 {
     VBOXVHWACMD* pCmd = VBOXVHWACMD_HEAD(pInfo);
-    vboxVHWACommandFree (ppdev, pCmd);
+    vbvaVHWACommandRelease (ppdev, pCmd);
 }
 
@@ -905 +911 @@
     }
 
-    vboxVHWACommandFree (ppdev, pCmd);
+    vbvaVHWACommandRelease (ppdev, pCmd);
     return NULL;
 }
@@ -933 +939 @@
     }
 
-    vboxVHWACommandFree (ppdev, pCmd);
+    vbvaVHWACommandRelease (ppdev, pCmd);
     return NULL;
 }
@@ -1000 +1006 @@
     }
 
-    vboxVHWACommandFree (ppdev, pCmd);
+    vbvaVHWACommandRelease (ppdev, pCmd);
     return rc;
 }
@@ -1022 +1028 @@
     }
 
-    vboxVHWACommandFree (ppdev, pCmd);
+    vbvaVHWACommandRelease (ppdev, pCmd);
 
     vboxVHWACommandCheckHostCmds(ppdev);