Changeset 51036 in vbox

Timestamp:

Apr 10, 2014 12:38:51 PM (11 years ago)

Author:

vboxsync

Message:

wddm: new command submission fixes

Location:

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

Files:

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

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

@@ -930 +930 @@
 }
 
-int VBoxCmdVbvaSubmit(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, struct VBOXCMDVBVA_HDR *pCmd, uint32_t cbCmd)
+int VBoxCmdVbvaSubmit(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, struct VBOXCMDVBVA_HDR *pCmd, uint32_t u32FenceID, uint32_t cbCmd)
 {
     int rc = VINF_SUCCESS;
 
-    Assert(pCmd->u32FenceID);
+    Assert(u32FenceID);
 
     pCmd->u8State = VBOXCMDVBVA_STATE_SUBMITTED;
 #ifdef DEBUG_misha
-    Assert(pCmd->u32FenceID == pVbva->u32FenceSubmitted + 1);
+    Assert(u32FenceID == pVbva->u32FenceSubmitted + 1);
 #endif
-    pVbva->u32FenceSubmitted = pCmd->u32FenceID;
-
     if (VBoxVBVAExGetSize(&pVbva->Vbva) < cbCmd)
     {
@@ -989 +987 @@
     }
 
+    pVbva->u32FenceSubmitted = u32FenceID;
+
     Assert(pvBuffer);
 
     memcpy(pvBuffer, pCmd, cbCmd);
+
+    ((VBOXCMDVBVA_HDR*)pvBuffer)->u32FenceID = u32FenceID;
 
     VBoxVBVAExBufferEndUpdate(&pVbva->Vbva);
@@ -1187 +1189 @@
     *pcPagesWritten = i;
     Assert(cbInitBuffer - cbBuffer == RT_OFFSETOF(VBOXCMDVBVA_PAGING_TRANSFER, Data.aPageNumbers[i]));
+    Assert(cbInitBuffer - cbBuffer >= sizeof (VBOXCMDVBVA_PAGING_TRANSFER));
     return cbInitBuffer - cbBuffer;
 }

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

@@ -212 +212 @@
 int VBoxCmdVbvaDestroy(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva);
 int VBoxCmdVbvaCreate(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, ULONG offBuffer, ULONG cbBuffer);
-int VBoxCmdVbvaSubmit(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, struct VBOXCMDVBVA_HDR *pCmd, uint32_t cbCmd);
+int VBoxCmdVbvaSubmit(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, struct VBOXCMDVBVA_HDR *pCmd, uint32_t u32FenceID, uint32_t cbCmd);
 bool VBoxCmdVbvaPreempt(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, uint32_t u32FenceID);
 uint32_t VBoxCmdVbvaCheckCompleted(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, bool fPingHost);

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

@@ -2096 +2096 @@
 
                 pQsOut->PagingBufferSegmentId = 0;
-                pQsOut->PagingBufferSize = 0xc00;
-                pQsOut->PagingBufferPrivateDataSize = 0;
+                pQsOut->PagingBufferSize = PAGE_SIZE;
+                pQsOut->PagingBufferPrivateDataSize = PAGE_SIZE;
             }
             }
@@ -3107 +3107 @@
 #endif
 
-    /* the DMA command buffer is located in system RAM, the host will need to pick it from there */
-    //BufInfo.fFlags = 0; /* see VBOXVDMACBUF_FLAG_xx */
+    uint32_t cbCmd = pSubmitCommand->DmaBufferPrivateDataSubmissionEndOffset - pSubmitCommand->DmaBufferPrivateDataSubmissionStartOffset;
+    uint32_t cbDma = pSubmitCommand->DmaBufferSubmissionEndOffset - pSubmitCommand->DmaBufferSubmissionStartOffset;
     VBOXCMDVBVA_HDR *pHdr;
-    VBOXCMDVBVA_SYSMEMCMD SysMem;
-    uint32_t cbCmd = pSubmitCommand->DmaBufferPrivateDataSubmissionEndOffset - pSubmitCommand->DmaBufferPrivateDataSubmissionStartOffset;
-    if (!cbCmd)
-    {
-        cbCmd = pSubmitCommand->DmaBufferSubmissionEndOffset - pSubmitCommand->DmaBufferSubmissionStartOffset;
-        if (!cbCmd || VBOXWDDM_DUMMY_DMABUFFER_SIZE == cbCmd)
-        {
-            SysMem.Hdr.u8OpCode = VBOXCMDVBVA_OPTYPE_NOPCMD;
-            SysMem.Hdr.u8Flags = 0;
-            SysMem.Hdr.u8State = VBOXCMDVBVA_STATE_SUBMITTED;
-            cbCmd = sizeof (SysMem.Hdr);
-        }
-        else
-        {
-            if (cbCmd < sizeof (VBOXCMDVBVA_HDR))
-            {
-                WARN(("DmaBufferPrivateDataSubmissionEndOffset (%d) - DmaBufferPrivateDataSubmissionStartOffset (%d) < sizeof (VBOXCMDVBVA_HDR) (%d)",
-                        pSubmitCommand->DmaBufferPrivateDataSubmissionEndOffset,
-                        pSubmitCommand->DmaBufferPrivateDataSubmissionStartOffset,
-                        sizeof (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR)));
-                return STATUS_INVALID_PARAMETER;
-            }
-
-            if (cbCmd > 0xffff)
-            {
-                WARN(("cbCmd too big"));
-                return STATUS_INVALID_PARAMETER;
-            }
-
-            SysMem.Hdr.u8OpCode = VBOXCMDVBVA_OPTYPE_SYSMEMCMD;
-            SysMem.Hdr.u8Flags = cbCmd & 0xff;
-            SysMem.Hdr.u.u8PrimaryID = (cbCmd >> 8) & 0xff;
-            SysMem.Hdr.u8State = VBOXCMDVBVA_STATE_SUBMITTED;
+    VBOXCMDVBVA_HDR NopCmd;
+    if (cbCmd < sizeof (VBOXCMDVBVA_HDR))
+    {
+        if (cbCmd)
+        {
+            WARN(("invalid command data"));
+            return STATUS_INVALID_PARAMETER;
+        }
+        NopCmd.u8OpCode = VBOXCMDVBVA_OPTYPE_NOPCMD;
+        NopCmd.u8Flags = 0;
+        NopCmd.u8State = VBOXCMDVBVA_STATE_SUBMITTED;
+        NopCmd.u32FenceID = sizeof (VBOXCMDVBVA_HDR);
+        cbCmd = sizeof (VBOXCMDVBVA_HDR);
+        pHdr = &NopCmd;
+    }
+    else
+    {
+        pHdr = (VBOXCMDVBVA_HDR*)(((uint8_t*)pSubmitCommand->pDmaBufferPrivateData) + pSubmitCommand->DmaBufferPrivateDataSubmissionStartOffset);
+        if (cbCmd != pHdr->u32FenceID)
+        {
+            WARN(("partial submission start!"));
+            cbCmd = pHdr->u32FenceID;
+        }
+    }
+
+    switch (pHdr->u8OpCode)
+    {
+        case VBOXCMDVBVA_OPTYPE_SYSMEMCMD:
+        {
+            VBOXCMDVBVA_SYSMEMCMD *pSysMem = (VBOXCMDVBVA_SYSMEMCMD*)pHdr;
             if (pSubmitCommand->DmaBufferPhysicalAddress.QuadPart & PAGE_OFFSET_MASK)
             {
@@ -3148 +3145 @@
                 return STATUS_INVALID_PARAMETER;
             }
-            SysMem.phCmd = (VBOXCMDVBVAPHADDR)(pSubmitCommand->DmaBufferPhysicalAddress.QuadPart + pSubmitCommand->DmaBufferSubmissionStartOffset);
-
-            cbCmd = sizeof (SysMem);
-        }
-
-        pHdr = &SysMem.Hdr;
-    }
-    else
-    {
-        if (cbCmd < sizeof (VBOXCMDVBVA_HDR))
-        {
-            WARN(("DmaBufferPrivateDataSubmissionEndOffset (%d) - DmaBufferPrivateDataSubmissionStartOffset (%d) < sizeof (VBOXCMDVBVA_HDR) (%d)",
-                    pSubmitCommand->DmaBufferPrivateDataSubmissionEndOffset,
-                    pSubmitCommand->DmaBufferPrivateDataSubmissionStartOffset,
-                    sizeof (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR)));
-            return STATUS_INVALID_PARAMETER;
-        }
-
-        pHdr = (VBOXCMDVBVA_HDR*)((uint8_t*)pSubmitCommand->pDmaBufferPrivateData + pSubmitCommand->DmaBufferPrivateDataSubmissionStartOffset);
-    }
-
-    pHdr->u32FenceID = pSubmitCommand->SubmissionFenceId;
-    int rc = VBoxCmdVbvaSubmit(pDevExt, &pDevExt->CmdVbva, pHdr, cbCmd);
+            pSysMem->phCmd = (VBOXCMDVBVAPHADDR)(pSubmitCommand->DmaBufferPhysicalAddress.QuadPart + pSubmitCommand->DmaBufferSubmissionStartOffset);
+#ifdef DEBUG
+            {
+                uint32_t cbRealDmaCmd = (pSysMem->Hdr.u8Flags | (pSysMem->Hdr.u.u8PrimaryID << 8));
+                Assert(cbRealDmaCmd >= cbDma);
+                if (cbDma < cbRealDmaCmd)
+                    WARN(("parrtial sysmem transfer"));
+            }
+#endif
+            break;
+        }
+        default:
+            break;
+    }
+
+    int rc = VBoxCmdVbvaSubmit(pDevExt, &pDevExt->CmdVbva, pHdr, pSubmitCommand->SubmissionFenceId, cbCmd);
     if (RT_SUCCESS(rc))
         return STATUS_SUCCESS;
@@ -3442 +3432 @@
 #endif
 
+            if (pBuildPagingBuffer->DmaBufferPrivateDataSize < sizeof (VBOXCMDVBVA_SYSMEMCMD))
+            {
+                WARN(("private data too small"));
+                return STATUS_INVALID_PARAMETER;
+            }
+
             Assert(!pBuildPagingBuffer->Transfer.MdlOffset);
 
@@ -3476 +3472 @@
             pPaging->Hdr.u8State = VBOXCMDVBVA_STATE_SUBMITTED;
             pPaging->Hdr.u32FenceID = 0;
-
 
             PMDL pMdl;
@@ -3528 +3523 @@
                 pBuildPagingBuffer->MultipassOffset = 0;
 
+            VBOXCMDVBVA_SYSMEMCMD *pSysMemCmd = (VBOXCMDVBVA_SYSMEMCMD*)pBuildPagingBuffer->pDmaBufferPrivateData;
+            pSysMemCmd->Hdr.u8OpCode = VBOXCMDVBVA_OPTYPE_SYSMEMCMD;
+            pSysMemCmd->Hdr.u8Flags = cbBuffer & 0xff;
+            pSysMemCmd->Hdr.u.u8PrimaryID = (cbBuffer >> 8) & 0xff;
+            pSysMemCmd->Hdr.u8State = VBOXCMDVBVA_STATE_SUBMITTED;
+            pSysMemCmd->Hdr.u32FenceID = sizeof (*pSysMemCmd);
+            pSysMemCmd->phCmd = 0;
+
+            cbPrivateData = sizeof (*pSysMemCmd);
+
             break;
         }
@@ -3539 +3544 @@
                 return STATUS_INVALID_PARAMETER;
             }
+
+            if (pBuildPagingBuffer->DmaBufferPrivateDataSize < sizeof (VBOXCMDVBVA_HDR))
+            {
+                WARN(("private data too small"));
+                return STATUS_INVALID_PARAMETER;
+            }
+
+            VBOXCMDVBVA_HDR *pHdr = (VBOXCMDVBVA_HDR*)pBuildPagingBuffer->pDmaBufferPrivateData;
+            pHdr->u8OpCode = VBOXCMDVBVA_OPTYPE_NOPCMD;
+            pHdr->u8Flags = 0;
+            pHdr->u.u8PrimaryID = 0;
+            pHdr->u8State = VBOXCMDVBVA_STATE_SUBMITTED;
+            pHdr->u32FenceID = sizeof (*pHdr);
+
+            cbPrivateData = sizeof (*pHdr);
             /** @todo: add necessary bits */
 //            WARN(("Impl!"));
@@ -3562 +3582 @@
     }
 
-    Assert(!cbPrivateData);
-
     Assert(pBuildPagingBuffer->Operation == DXGK_OPERATION_DISCARD_CONTENT || cbBuffer);
+    Assert(cbBuffer <= pBuildPagingBuffer->DmaSize);
+    Assert(cbBuffer == 0 || cbBuffer >= sizeof (VBOXCMDVBVA_PAGING_TRANSFER) || cbBuffer == VBOXWDDM_DUMMY_DMABUFFER_SIZE);
+    AssertCompile(VBOXWDDM_DUMMY_DMABUFFER_SIZE < 8);
     pBuildPagingBuffer->pDmaBuffer = ((uint8_t*)pBuildPagingBuffer->pDmaBuffer) + cbBuffer;
     pBuildPagingBuffer->pDmaBufferPrivateData = ((uint8_t*)pBuildPagingBuffer->pDmaBufferPrivateData) + cbPrivateData;
@@ -5827 +5848 @@
         uint32_t cbBuffer = 0;
         uint32_t cbPrivateData = 0;
+        uint32_t cbCmd = 0;
         VBOXCMDVBVA_HDR* pCmd = (VBOXCMDVBVA_HDR*)pRender->pDmaBufferPrivateData;
 
@@ -5915 +5937 @@
                 }
 
+                cbCmd = cbPrivateData;
+
                 break;
             }
@@ -5946 +5970 @@
                 }
 
+                cbCmd = cbPrivateData;
+
                 break;
             }
@@ -5959 +5985 @@
 
         pCmd->u8State = VBOXCMDVBVA_STATE_SUBMITTED;
-        /* sanity */
-        pCmd->u32FenceID = 0;
+        pCmd->u32FenceID = cbPrivateData;
     }
     __except (EXCEPTION_EXECUTE_HANDLER)
@@ -5967 +5992 @@
         WARN(("invalid parameter"));
     }
-//    LOGF(("LEAVE, hContext(0x%x)", hContext));
-
-    return Status;
-
 //    LOGF(("LEAVE, hContext(0x%x)", hContext));
 
@@ -6516 +6537 @@
 
     pHdr->u8State = VBOXCMDVBVA_STATE_SUBMITTED;
-    /* sanity */
-    pHdr->u32FenceID = 0;
+
+    pHdr->u32FenceID = cbPrivateData;
 
     Assert(cbBuffer);