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

Timestamp:

Oct 18, 2010 7:26:40 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: chromium hgsmi fixes

Location:

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

Files:

• VBoxVideoShgsmi.cpp (modified) (1 diff)
• VBoxVideoVdma.cpp (modified) (1 diff)
• VBoxVideoVdma.h (modified) (1 diff)
• VBoxVideoWddm.cpp (modified) (1 diff)

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

@@ -65 +65 @@
     {
         PFNVBOXSHGSMICMDCOMPLETION pfnCompletion = (PFNVBOXSHGSMICMDCOMPLETION)pHeader->u64Info1;
-        pfnCompletion(pHeap, VBoxSHGSMIBufferData (pHeader), (PVOID)pHeader->u64Info2);
+        if (pfnCompletion)
+            pfnCompletion(pHeap, VBoxSHGSMIBufferData (pHeader), (PVOID)pHeader->u64Info2);
     }
 

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

@@ -1289 +1289 @@
     return rc;
 }
+
+int vboxVdmaCBufDrSubmitSynch(PDEVICE_EXTENSION pDevExt, PVBOXVDMAINFO pInfo, PVBOXVDMACBUF_DR pDr)
+{
+    const VBOXSHGSMIHEADER* pHdr = VBoxSHGSMICommandPrepAsynch (&pInfo->CmdHeap, pDr, NULL, NULL, VBOXSHGSMI_FLAG_GH_SYNCH);
+    Assert(pHdr);
+    int rc = VERR_GENERAL_FAILURE;
+    if (pHdr)
+    {
+        do
+        {
+            HGSMIOFFSET offCmd = VBoxSHGSMICommandOffset(&pInfo->CmdHeap, pHdr);
+            Assert(offCmd != HGSMIOFFSET_VOID);
+            if (offCmd != HGSMIOFFSET_VOID)
+            {
+                rc = vboxWddmVdmaSubmit(pDevExt, pInfo, offCmd);
+                AssertRC(rc);
+                if (RT_SUCCESS(rc))
+                {
+                    VBoxSHGSMICommandDoneAsynch(&pInfo->CmdHeap, pHdr);
+                    AssertRC(rc);
+                    break;
+                }
+            }
+            else
+                rc = VERR_INVALID_PARAMETER;
+            /* fail to submit, cancel it */
+            VBoxSHGSMICommandCancelAsynch(&pInfo->CmdHeap, pHdr);
+        } while (0);
+    }
+    else
+        rc = VERR_INVALID_PARAMETER;
+    return rc;
+}
 #endif
 

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

@@ -280 +280 @@
 int vboxVdmaFlush (struct _DEVICE_EXTENSION* pDevExt, PVBOXVDMAINFO pInfo);
 int vboxVdmaCBufDrSubmit (struct _DEVICE_EXTENSION* pDevExt, PVBOXVDMAINFO pInfo, PVBOXVDMACBUF_DR pDr);
+int vboxVdmaCBufDrSubmitSynch (PDEVICE_EXTENSION pDevExt, PVBOXVDMAINFO pInfo, PVBOXVDMACBUF_DR pDr);
 struct VBOXVDMACBUF_DR* vboxVdmaCBufDrCreate (PVBOXVDMAINFO pInfo, uint32_t cbTrailingData);
 void vboxVdmaCBufDrFree (PVBOXVDMAINFO pInfo, struct VBOXVDMACBUF_DR* pDr);

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

@@ -2569 +2569 @@
         case DXGK_OPERATION_TRANSFER:
         {
-            PVBOXWDDM_ALLOCATION pAlloc = (PVBOXWDDM_ALLOCATION)pBuildPagingBuffer->Transfer.hAllocation;
-            uint8_t* pvVramBase = pDevExt->pvVisibleVram;
-            SIZE_T cbSize = pBuildPagingBuffer->Transfer.TransferSize;
-            uint8_t *pvSrc, *pvDst;
-            if (pBuildPagingBuffer->Transfer.Source.SegmentId)
-            {
+            UINT cbCmd = VBOXVDMACMD_SIZE(VBOXVDMACMD_DMA_BPB_TRANSFER);
+            PVBOXVDMACBUF_DR pDr = vboxVdmaCBufDrCreate (&pDevExt->u.primary.Vdma, cbCmd);
+            Assert(pDr);
+            if (pDr)
+            {
+                // vboxVdmaCBufDrCreate zero initializes the pDr
+                pDr->fFlags = VBOXVDMACBUF_FLAG_BUF_FOLLOWS_DR;
+                pDr->cbBuf = cbCmd;
+                pDr->rc = VERR_NOT_IMPLEMENTED;
+
+                PVBOXVDMACMD pHdr = VBOXVDMACBUF_DR_TAIL(pDr, VBOXVDMACMD);
+                pHdr->enmType = VBOXVDMACMD_TYPE_DMA_BPB_TRANSFER;
+                pHdr->u32CmdSpecific = 0;
+                VBOXVDMACMD_DMA_BPB_TRANSFER *pBody = VBOXVDMACMD_BODY(pHdr, VBOXVDMACMD_DMA_BPB_TRANSFER);
+                pBody->cbTransferSize = (uint32_t)pBuildPagingBuffer->Transfer.TransferSize;
+                pBody->fFlags = 0;
+
+                if (pBuildPagingBuffer->Transfer.Source.SegmentId)
+                {
 #ifdef DEBUG_misha
-                Assert(pBuildPagingBuffer->Transfer.Source.SegmentAddress.QuadPart);
-#endif
-                pvSrc  = pvVramBase + pBuildPagingBuffer->Transfer.Source.SegmentAddress.QuadPart;
-                pvSrc += pBuildPagingBuffer->Transfer.TransferOffset;
+                    Assert(pBuildPagingBuffer->Transfer.Source.SegmentAddress.QuadPart);
+#endif
+                    uint64_t off = pBuildPagingBuffer->Transfer.Source.SegmentAddress.QuadPart;
+                    off += pBuildPagingBuffer->Transfer.TransferOffset;
+                    pBody->Src.offVramBuf = off;
+                    pBody->fFlags |= VBOXVDMACMD_DMA_BPB_TRANSFER_F_SRC_VRAMOFFSET;
+                }
+                else
+                {
+                    pBody->Src.phBuf = MmGetMdlPfnArray(pBuildPagingBuffer->Transfer.Source.pMdl)[pBuildPagingBuffer->Transfer.MdlOffset] << 12;
+#ifdef DEBUG
+                    {
+                        PFN_NUMBER num = MmGetMdlPfnArray(pBuildPagingBuffer->Transfer.Source.pMdl)[pBuildPagingBuffer->Transfer.MdlOffset];
+                        for (UINT i = 1; i < ((pBuildPagingBuffer->Transfer.TransferSize + 0xfff) >> 12); ++i)
+                        {
+                            PFN_NUMBER cur = MmGetMdlPfnArray(pBuildPagingBuffer->Transfer.Source.pMdl)[pBuildPagingBuffer->Transfer.MdlOffset+1];
+                            Assert(cur == ++num);
+                        }
+                    }
+#endif
+                }
+
+                if (pBuildPagingBuffer->Transfer.Destination.SegmentId)
+                {
+#ifdef DEBUG_misha
+                    Assert(pBuildPagingBuffer->Transfer.Destination.SegmentAddress.QuadPart);
+#endif
+                    uint64_t off = pBuildPagingBuffer->Transfer.Destination.SegmentAddress.QuadPart;
+                    off += pBuildPagingBuffer->Transfer.TransferOffset;
+                    pBody->Dst.offVramBuf = off;
+                    pBody->fFlags |= VBOXVDMACMD_DMA_BPB_TRANSFER_F_DST_VRAMOFFSET;
+                }
+                else
+                {
+                    pBody->Dst.phBuf = MmGetMdlPfnArray(pBuildPagingBuffer->Transfer.Destination.pMdl)[pBuildPagingBuffer->Transfer.MdlOffset] << 12;
+#ifdef DEBUG
+                    {
+                        PFN_NUMBER num = MmGetMdlPfnArray(pBuildPagingBuffer->Transfer.Destination.pMdl)[pBuildPagingBuffer->Transfer.MdlOffset];
+                        for (UINT i = 1; i < ((pBuildPagingBuffer->Transfer.TransferSize + 0xfff) >> 12); ++i)
+                        {
+                            PFN_NUMBER cur = MmGetMdlPfnArray(pBuildPagingBuffer->Transfer.Destination.pMdl)[pBuildPagingBuffer->Transfer.MdlOffset+1];
+                            Assert(cur == ++num);
+                        }
+                    }
+#endif
+                }
+
+                int rc = vboxVdmaCBufDrSubmitSynch(pDevExt, &pDevExt->u.primary.Vdma, pDr);
+                AssertRC(rc);
+                if (RT_SUCCESS(rc))
+                    Status = STATUS_SUCCESS;
+                else
+                    Status = STATUS_UNSUCCESSFUL;
+
+                vboxVdmaCBufDrFree(&pDevExt->u.primary.Vdma, pDr);
             }
             else
             {
-                pvSrc  = (uint8_t*)MmGetMdlVirtualAddress(pBuildPagingBuffer->Transfer.Source.pMdl);
-                pvSrc += pBuildPagingBuffer->Transfer.MdlOffset * 0x1000 /* page size */;
-            }
-
-            if (pBuildPagingBuffer->Transfer.Destination.SegmentId)
-            {
-#ifdef DEBUG_misha
-                Assert(pBuildPagingBuffer->Transfer.Destination.SegmentAddress.QuadPart);
-#endif
-                pvDst  = pvVramBase + pBuildPagingBuffer->Transfer.Destination.SegmentAddress.QuadPart;
-                pvDst += pBuildPagingBuffer->Transfer.TransferOffset;
-            }
-            else
-            {
-                pvDst  = (uint8_t*)MmGetMdlVirtualAddress(pBuildPagingBuffer->Transfer.Destination.pMdl);
-                pvDst += pBuildPagingBuffer->Transfer.MdlOffset * 0x1000 /* page size */;
-            }
-
-            memcpy(pvDst, pvSrc, cbSize);
-//            pBuildPagingBuffer->pDmaBuffer = (uint8_t*)pBuildPagingBuffer->pDmaBuffer + VBOXVDMACMD_SIZE(VBOXVDMACMD_DMA_BPB_TRANSFER);
+                /* @todo: try flushing.. */
+                drprintf((__FUNCTION__": vboxVdmaCBufDrCreate returned NULL\n"));
+                Status = STATUS_INSUFFICIENT_RESOURCES;
+            }
             break;
         }