Changeset 51266 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm

Timestamp:

May 15, 2014 6:25:40 PM (11 years ago)

Author:

vboxsync

Message:

wddm: fix preemption

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm

Files:

• VBoxMPVbva.cpp (modified) (6 diffs)
• VBoxMPVbva.h (modified) (1 diff)
• VBoxMPWddm.cpp (modified) (1 diff)

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

@@ -868 +868 @@
     PVBOXMP_DEVEXT pDevExt;
     VBOXCMDVBVA *pVbva;
-    uint32_t u32FenceID;
+    /* last completted fence id */
+    uint32_t u32FenceCompleted;
+    /* last submitted fence id */
+    uint32_t u32FenceSubmitted;
 } VBOXCMDVBVA_CHECK_COMPLETED_CB;
 
@@ -876 +879 @@
     BOOLEAN bRc = DxgkDdiInterruptRoutineNew(pCompleted->pDevExt, 0);
     if (pCompleted->pVbva)
-        pCompleted->u32FenceID = pCompleted->pVbva->u32FenceCompleted;
+    {
+        pCompleted->u32FenceCompleted = pCompleted->pVbva->u32FenceCompleted;
+        pCompleted->u32FenceSubmitted = pCompleted->pVbva->u32FenceSubmitted;
+    }
+    else
+    {
+        WARN(("no vbva"));
+        pCompleted->u32FenceCompleted = 0;
+        pCompleted->u32FenceSubmitted = 0;
+    }
     return bRc;
 }
 
 
-static uint32_t vboxCmdVbvaCheckCompleted(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, bool fPingHost, HGSMIGUESTCOMMANDCONTEXT *pCtx, bool fBufferOverflow)
+static uint32_t vboxCmdVbvaCheckCompleted(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, bool fPingHost, HGSMIGUESTCOMMANDCONTEXT *pCtx, bool fBufferOverflow, uint32_t *pu32FenceSubmitted)
 {
     if (fPingHost)
@@ -889 +901 @@
     context.pDevExt = pDevExt;
     context.pVbva = pVbva;
-    context.u32FenceID = 0;
+    context.u32FenceCompleted = 0;
+    context.u32FenceSubmitted = 0;
     BOOLEAN bRet;
     NTSTATUS Status = pDevExt->u.primary.DxgkInterface.DxgkCbSynchronizeExecution(
@@ -899 +912 @@
     Assert(Status == STATUS_SUCCESS);
 
-    return context.u32FenceID;
+    if (pu32FenceSubmitted)
+        *pu32FenceSubmitted = context.u32FenceSubmitted;
+
+    return context.u32FenceCompleted;
 }
 
@@ -906 +922 @@
     PVBOXMP_DEVEXT pDevExt = (PVBOXMP_DEVEXT)pvFlush;
 
-    vboxCmdVbvaCheckCompleted(pDevExt, NULL,  true /*fPingHost*/, pHGSMICtx, true /*fBufferOverflow*/);
+    vboxCmdVbvaCheckCompleted(pDevExt, NULL,  true /*fPingHost*/, pHGSMICtx, true /*fBufferOverflow*/, NULL);
 }
 
@@ -1139 +1155 @@
 }
 
-uint32_t VBoxCmdVbvaCheckCompleted(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, bool fPingHost)
-{
-    return vboxCmdVbvaCheckCompleted(pDevExt, pVbva, fPingHost, &VBoxCommonFromDeviceExt(pDevExt)->guestCtx, false /* fBufferOverflow */);
+uint32_t VBoxCmdVbvaCheckCompleted(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, bool fPingHost, uint32_t *pu32FenceSubmitted)
+{
+    return vboxCmdVbvaCheckCompleted(pDevExt, pVbva, fPingHost, &VBoxCommonFromDeviceExt(pDevExt)->guestCtx, false /* fBufferOverflow */, pu32FenceSubmitted);
 }
 

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

@@ -216 +216 @@
 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 VBoxCmdVbvaCheckCompleted(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, bool fPingHost, uint32_t *pu32FenceSubmitted);
 bool VBoxCmdVbvaCheckCompletedIrq(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva);
 

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

@@ -4968 +4968 @@
 
     PVBOXMP_DEVEXT pDevExt = (PVBOXMP_DEVEXT)hAdapter;
-    pCurrentFence->CurrentFence = VBoxCmdVbvaCheckCompleted(pDevExt, &pDevExt->CmdVbva, false);
+
+    WARN(("=>DxgkDdiQueryCurrentFenceNew"));
+
+    uint32_t u32FenceSubmitted = 0;
+    uint32_t u32FenceCompleted = 0;
+
+    LARGE_INTEGER DelayInterval;
+    DelayInterval.QuadPart = -10LL * 1000LL * 1000LL;
+
+    for (;;)
+    {
+        u32FenceCompleted = VBoxCmdVbvaCheckCompleted(pDevExt, &pDevExt->CmdVbva, false, &u32FenceSubmitted);
+        if (!u32FenceCompleted)
+        {
+            WARN(("VBoxCmdVbvaCheckCompleted failed"));
+            return STATUS_UNSUCCESSFUL;
+        }
+
+        if (u32FenceSubmitted == u32FenceCompleted)
+            break;
+
+        WARN(("uncompleted fences, u32FenceSubmitted(%d), u32FenceCompleted(%d)", u32FenceSubmitted, u32FenceCompleted));
+
+        NTSTATUS Status = KeDelayExecutionThread(KernelMode, FALSE, &DelayInterval);
+        if (Status != STATUS_SUCCESS)
+            WARN(("KeDelayExecutionThread failed %#x", Status));
+    }
+
+    pCurrentFence->CurrentFence = u32FenceCompleted;
+
+    WARN(("<=DxgkDdiQueryCurrentFenceNew"));
 
     LOGF(("LEAVE, hAdapter(0x%x)", hAdapter));