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

Timestamp:

Oct 15, 2010 11:10:10 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: chromium hgsmi fixes

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp (modified) (8 diffs)

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

@@ -60 +60 @@
     {
         pInfo->offAlloc = (VBOXVIDEOOFFSET)pDmaAlloc->PhysicalAddress.QuadPart;
+        pInfo->segmentIdAlloc = pDmaAlloc->SegmentId;
+    }
+    else
+        pInfo->segmentIdAlloc = 0;
+    pInfo->srcId = pAlloc->SurfDesc.VidPnSourceId;
+}
+
+static void vboxWddmPopulateDmaAllocInfoWithOffset(PVBOXWDDM_DMA_ALLOCINFO pInfo, PVBOXWDDM_ALLOCATION pAlloc, DXGK_ALLOCATIONLIST *pDmaAlloc, uint32_t offStart)
+{
+    pInfo->pAlloc = pAlloc;
+    if (pDmaAlloc->SegmentId)
+    {
+        pInfo->offAlloc = (VBOXVIDEOOFFSET)pDmaAlloc->PhysicalAddress.QuadPart + offStart;
         pInfo->segmentIdAlloc = pDmaAlloc->SegmentId;
     }
@@ -1437 +1450 @@
         case VBOXWDDM_ALLOC_TYPE_UMD_HGSMI_BUFFER:
         {
-            ObDereferenceObject(pAllocation->pSynchEvent);
+            if (pAllocation->pSynchEvent)
+            {
+                ObDereferenceObject(pAllocation->pSynchEvent);
+            }
             break;
         }
@@ -1577 +1593 @@
                     pAllocation->SurfDesc.cbSize = pAllocInfo->cbBuffer;
                     pAllocationInfo->Flags.CpuVisible = 1;
-                    pAllocationInfo->Flags.SynchronousPaging = 1;
+//                    pAllocationInfo->Flags.SynchronousPaging = 1;
                     pAllocationInfo->AllocationPriority = D3DDDI_ALLOCATIONPRIORITY_MAXIMUM;
                     switch (pAllocInfo->enmSynchType)
@@ -1595 +1611 @@
                         case VBOXUHGSMI_SYNCHOBJECT_TYPE_NONE:
                             pAllocation->pSynchEvent = NULL;
-                            Status == STATUS_SUCCESS;
+                            Status = STATUS_SUCCESS;
                             break;
                         default:
@@ -2033 +2049 @@
                         DXGK_ALLOCATIONLIST *pAllocation2Patch = (DXGK_ALLOCATIONLIST*)(pPrivateBuf + pPatchList->PatchOffset);
                         pAllocation2Patch->SegmentId = pAllocationList->SegmentId;
-                        pAllocation2Patch->PhysicalAddress = pAllocationList->PhysicalAddress;
+                        pAllocation2Patch->PhysicalAddress.QuadPart = pAllocationList->PhysicalAddress.QuadPart + pPatchList->AllocationOffset;
+                        Assert(!(pAllocationList->PhysicalAddress.QuadPart & 0xfffUL)); /* <- just a check to ensure allocation offset does not go here */
                     }
                 }
@@ -2543 +2560 @@
 
     NTSTATUS Status = STATUS_SUCCESS;
+    PDEVICE_EXTENSION pDevExt = (PDEVICE_EXTENSION)hAdapter;
 
     dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", hAdapter));
@@ -2551 +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)
+            {
+#ifdef DEBUG_misha
+                Assert(pBuildPagingBuffer->Transfer.Source.SegmentAddress.QuadPart);
+#endif
+                pvSrc  = pvVramBase + pBuildPagingBuffer->Transfer.Source.SegmentAddress.QuadPart;
+                pvSrc += pBuildPagingBuffer->Transfer.TransferOffset;
+            }
+            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);
             break;
@@ -4067 +4118 @@
             {
                 PVBOXWDDM_ALLOCATION pAlloc = vboxWddmGetAllocationFromAllocList(pDevExt, pAllocationList);
-                vboxWddmPopulateDmaAllocInfo(&pSubmInfo->Alloc, pAlloc, pAllocationList);
+                vboxWddmPopulateDmaAllocInfoWithOffset(&pSubmInfo->Alloc, pAlloc, pAllocationList, pSubmUmInfo->offData);
 
                 pSubmInfo->cbData = pSubmUmInfo->cbData;