Changeset 52226 in vbox

Timestamp:

Jul 29, 2014 12:53:58 PM (10 years ago)

Author:

vboxsync

Message:

wddm: preemption fixes

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVbva.cpp (modified) (11 diffs)
• src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVbva.h (modified) (2 diffs)
• src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVbva.cpp

@@ -785 +785 @@
     PVBOXMP_DEVEXT pDevExt = pData->pDevExt;
     VBOXCMDVBVA *pVbva = pData->pVbva;
-    if (!pData->u32SubmitFenceId || pVbva->u32FenceCompleted == pData->u32SubmitFenceId)
+    Assert(pVbva->u32FenceProcessed >= pVbva->u32FenceCompleted);
+    if (!pData->u32SubmitFenceId || pVbva->u32FenceProcessed == pData->u32SubmitFenceId)
     {
         vboxCmdVbvaDdiNotifyCompleteIrq(pDevExt, pVbva, pData->u32PreemptFenceId, DXGK_INTERRUPT_DMA_PREEMPTED);
@@ -793 +794 @@
     else
     {
-        Assert(pVbva->u32FenceCompleted < pData->u32SubmitFenceId);
+        Assert(pVbva->u32FenceProcessed < pData->u32SubmitFenceId);
         Assert(pVbva->cPreempt <= VBOXCMDVBVA_PREEMPT_EL_SIZE);
         if (pVbva->cPreempt == VBOXCMDVBVA_PREEMPT_EL_SIZE)
@@ -872 +873 @@
     /* last submitted fence id */
     uint32_t u32FenceSubmitted;
+    /* last processed fence id (i.e. either completed or cancelled) */
+    uint32_t u32FenceProcessed;
 } VBOXCMDVBVA_CHECK_COMPLETED_CB;
 
@@ -882 +885 @@
         pCompleted->u32FenceCompleted = pCompleted->pVbva->u32FenceCompleted;
         pCompleted->u32FenceSubmitted = pCompleted->pVbva->u32FenceSubmitted;
+        pCompleted->u32FenceProcessed = pCompleted->pVbva->u32FenceProcessed;
     }
     else
@@ -888 +892 @@
         pCompleted->u32FenceCompleted = 0;
         pCompleted->u32FenceSubmitted = 0;
+        pCompleted->u32FenceProcessed = 0;
     }
     return bRc;
@@ -893 +898 @@
 
 
-static uint32_t vboxCmdVbvaCheckCompleted(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, bool fPingHost, HGSMIGUESTCOMMANDCONTEXT *pCtx, bool fBufferOverflow, uint32_t *pu32FenceSubmitted)
+static uint32_t vboxCmdVbvaCheckCompleted(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, bool fPingHost, HGSMIGUESTCOMMANDCONTEXT *pCtx, bool fBufferOverflow, uint32_t *pu32FenceSubmitted, uint32_t *pu32FenceProcessed)
 {
     if (fPingHost)
@@ -903 +908 @@
     context.u32FenceCompleted = 0;
     context.u32FenceSubmitted = 0;
+    context.u32FenceProcessed = 0;
     BOOLEAN bRet;
     NTSTATUS Status = pDevExt->u.primary.DxgkInterface.DxgkCbSynchronizeExecution(
@@ -915 +921 @@
         *pu32FenceSubmitted = context.u32FenceSubmitted;
 
+    if (pu32FenceProcessed)
+        *pu32FenceProcessed = context.u32FenceProcessed;
+
     return context.u32FenceCompleted;
 }
@@ -922 +931 @@
     PVBOXMP_DEVEXT pDevExt = (PVBOXMP_DEVEXT)pvFlush;
 
-    vboxCmdVbvaCheckCompleted(pDevExt, NULL,  true /*fPingHost*/, pHGSMICtx, true /*fBufferOverflow*/, NULL);
+    vboxCmdVbvaCheckCompleted(pDevExt, NULL,  true /*fPingHost*/, pHGSMICtx, true /*fBufferOverflow*/, NULL, NULL);
 }
 
@@ -1112 +1121 @@
         VBoxVBVAExCBufferCompleted(&pVbva->Vbva);
 
+        if (!u32FenceID)
+        {
+            WARN(("fence is NULL"));
+            continue;
+        }
+
+        pVbva->u32FenceProcessed = u32FenceID;
+
         if (u8State == VBOXCMDVBVA_STATE_IN_PROGRESS)
-        {
-            if (!u32FenceID)
-            {
-                WARN(("fence is NULL"));
-                continue;
-            }
-
             pVbva->u32FenceCompleted = u32FenceID;
-        }
         else
         {
@@ -1155 +1164 @@
 }
 
-uint32_t VBoxCmdVbvaCheckCompleted(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, bool fPingHost, uint32_t *pu32FenceSubmitted)
-{
-    return vboxCmdVbvaCheckCompleted(pDevExt, pVbva, fPingHost, &VBoxCommonFromDeviceExt(pDevExt)->guestCtx, false /* fBufferOverflow */, pu32FenceSubmitted);
+uint32_t VBoxCmdVbvaCheckCompleted(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, bool fPingHost, uint32_t *pu32FenceSubmitted, uint32_t *pu32FenceProcessed)
+{
+    return vboxCmdVbvaCheckCompleted(pDevExt, pVbva, fPingHost, &VBoxCommonFromDeviceExt(pDevExt)->guestCtx, false /* fBufferOverflow */, pu32FenceSubmitted, pu32FenceProcessed);
 }
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVbva.h

@@ -132 +132 @@
     /* last submitted fence id */
     uint32_t u32FenceSubmitted;
+    /* last processed fence id (i.e. either completed or cancelled) */
+    uint32_t u32FenceProcessed;
 
     /* node ordinal */
@@ -216 +218 @@
 VBOXCMDVBVA_HDR* VBoxCmdVbvaSubmitLock(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, uint32_t cbCmd);
 bool VBoxCmdVbvaPreempt(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, uint32_t u32FenceID);
-uint32_t VBoxCmdVbvaCheckCompleted(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, bool fPingHost, uint32_t *pu32FenceSubmitted);
+uint32_t VBoxCmdVbvaCheckCompleted(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, bool fPingHost, uint32_t *pu32FenceSubmitted, uint32_t *pu32FenceProcessed);
 bool VBoxCmdVbvaCheckCompletedIrq(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva);
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -4968 +4968 @@
     uint32_t u32FenceSubmitted = 0;
     uint32_t u32FenceCompleted = 0;
+    uint32_t u32FenceProcessed = 0;
 
     LARGE_INTEGER DelayInterval;
@@ -4974 +4975 @@
     for (;;)
     {
-        u32FenceCompleted = VBoxCmdVbvaCheckCompleted(pDevExt, &pDevExt->CmdVbva, false, &u32FenceSubmitted);
+        u32FenceCompleted = VBoxCmdVbvaCheckCompleted(pDevExt, &pDevExt->CmdVbva, false, &u32FenceSubmitted, &u32FenceProcessed);
         if (!u32FenceCompleted)
         {
@@ -4981 +4982 @@
         }
 
-        if (u32FenceSubmitted == u32FenceCompleted)
+        if (u32FenceSubmitted == u32FenceProcessed)
             break;
 
-        WARN(("uncompleted fences, u32FenceSubmitted(%d), u32FenceCompleted(%d)", u32FenceSubmitted, u32FenceCompleted));
+        WARN(("uncompleted fences, u32FenceSubmitted(%d), u32FenceCompleted(%d) u32FenceProcessed(%d)", u32FenceSubmitted, u32FenceCompleted, u32FenceProcessed));
 
         NTSTATUS Status = KeDelayExecutionThread(KernelMode, FALSE, &DelayInterval);