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

Timestamp:

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

Author:

vboxsync

Message:

wddm/3d: chromium hgsmi fixes

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Display/wddm/VBoxCrHgsmi.cpp (modified) (4 diffs)
• Display/wddm/VBoxDispD3D.cpp (modified) (8 diffs)
• Display/wddm/VBoxDispD3D.h (modified) (1 diff)
• Display/wddm/VBoxUhgsmiBase.h (modified) (3 diffs)
• Miniport/wddm/VBoxVideoWddm.cpp (modified) (8 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxCrHgsmi.cpp

@@ -54 +54 @@
     if (g_hVBoxCrHgsmiProvider)
     {
+        if (g_pfnVBoxDispCrHgsmiInit)
+        {
+            g_pfnVBoxDispCrHgsmiInit(pCallbacks);
+        }
         ++g_cVBoxCrHgsmiProvider;
         return VINF_SUCCESS;
@@ -73 +77 @@
     {
         hClient = g_pfnVBoxDispCrHgsmiQueryClient();
+#ifdef DEBUG_misha
+        Assert(hClient);
+#endif
         if (hClient)
             return hClient;
@@ -78 +85 @@
     PVBOXUHGSMI_PRIVATE_KMT pHgsmiGL = gt_pHgsmiGL;
     if (pHgsmiGL)
+    {
+        Assert(pHgsmiGL->BasePrivate.hClient);
         return pHgsmiGL->BasePrivate.hClient;
+    }
     pHgsmiGL = (PVBOXUHGSMI_PRIVATE_KMT)RTMemAllocZ(sizeof (*pHgsmiGL));
     if (pHgsmiGL)
@@ -84 +94 @@
         HRESULT hr = vboxUhgsmiKmtCreate(pHgsmiGL, TRUE /* bD3D tmp for injection thread*/);
         Assert(hr == S_OK);
-        hClient = g_VBoxCrHgsmiCallbacks.pfnClientCreate(&pHgsmiGL->BasePrivate.Base);
-        Assert(hClient);
-        pHgsmiGL->BasePrivate.hClient = hClient;
-        gt_pHgsmiGL = pHgsmiGL;
+        if (hr == S_OK)
+        {
+            hClient = g_VBoxCrHgsmiCallbacks.pfnClientCreate(&pHgsmiGL->BasePrivate.Base);
+            Assert(hClient);
+            pHgsmiGL->BasePrivate.hClient = hClient;
+            gt_pHgsmiGL = pHgsmiGL;
+        }
     }
     else

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.cpp

@@ -732 +732 @@
 #endif
 
-VBOXWDDMDISP_DECL(int) VBoxDispCrHgsmiInit(PVBOXCRHGSMI_CALLBACKS pCallbacks)
-{
-#ifdef VBOX_WITH_CRHGSMI
-    g_VBoxCrHgsmiCallbacks = *pCallbacks;
-#endif
-    return VINF_SUCCESS;
-}
-
 #ifdef VBOX_WITH_CRHGSMI
 static __declspec(thread) PVBOXUHGSMI_PRIVATE_BASE gt_pHgsmi = NULL;
 #endif
 
+VBOXWDDMDISP_DECL(int) VBoxDispCrHgsmiInit(PVBOXCRHGSMI_CALLBACKS pCallbacks)
+{
+#ifdef VBOX_WITH_CRHGSMI
+    vboxDispLock(); /* the lock is needed here only to ensure callbacks are not initialized & used concurrently
+                     * @todo: make a separate call used to init the per-thread info and make the VBoxDispCrHgsmiInit be called only once */
+    g_VBoxCrHgsmiCallbacks = *pCallbacks;
+    PVBOXUHGSMI_PRIVATE_BASE pHgsmi = gt_pHgsmi;
+#ifdef DEBUG_misha
+    Assert(pHgsmi);
+#endif
+    if (pHgsmi)
+    {
+        if (!pHgsmi->hClient)
+        {
+            pHgsmi->hClient = g_VBoxCrHgsmiCallbacks.pfnClientCreate(&pHgsmi->Base);
+            Assert(pHgsmi->hClient);
+        }
+    }
+    vboxDispUnlock();
+#endif
+    return VINF_SUCCESS;
+}
+
 VBOXWDDMDISP_DECL(int) VBoxDispCrHgsmiTerm()
 {
@@ -753 +768 @@
 #ifdef VBOX_WITH_CRHGSMI
     PVBOXUHGSMI_PRIVATE_BASE pHgsmi = gt_pHgsmi;
+#ifdef DEBUG_misha
+    Assert(pHgsmi);
+#endif
     if (pHgsmi)
+    {
+        Assert(pHgsmi->hClient);
         return pHgsmi->hClient;
+    }
 #endif
     return NULL;
@@ -760 +781 @@
 
 #ifdef VBOX_WITH_CRHGSMI
-static int vboxUhgsmiGlobalRetain()
-{
-    int rc = VINF_SUCCESS;
+static HRESULT vboxUhgsmiGlobalRetain()
+{
+    HRESULT hr = S_OK;
     vboxDispLock();
     if (!g_cVBoxUhgsmiKmtRefs)
     {
-        rc = vboxUhgsmiKmtCreate(&g_VBoxUhgsmiKmt, TRUE);
-        AssertRC(rc);
-    }
-
-    if (RT_SUCCESS(rc))
+        hr = vboxUhgsmiKmtCreate(&g_VBoxUhgsmiKmt, TRUE);
+        Assert(hr == S_OK);
+        /* can not do it here because callbacks may not be set yet
+         * @todo: need to call the cr lib from here to get the callbacks
+         * rather than making the cr lib call us */
+//        if (hr == S_OK)
+//        {
+//            g_VBoxUhgsmiKmt.BasePrivate.hClient = g_VBoxCrHgsmiCallbacks.pfnClientCreate(&g_VBoxUhgsmiKmt.BasePrivate.Base);
+//            Assert(g_VBoxUhgsmiKmt.BasePrivate.hClient);
+//        }
+    }
+
+    if (hr == S_OK)
     {
         ++g_cVBoxUhgsmiKmtRefs;
@@ -776 +805 @@
     vboxDispUnlock();
 
-    return rc;
-}
-
-static int vboxUhgsmiGlobalRelease()
-{
-    int rc = VINF_SUCCESS;
+    return hr;
+}
+
+static HRESULT vboxUhgsmiGlobalRelease()
+{
+    HRESULT hr = S_OK;
     vboxDispLock();
     --g_cVBoxUhgsmiKmtRefs;
     if (!g_cVBoxUhgsmiKmtRefs)
     {
-        rc = vboxUhgsmiKmtDestroy(&g_VBoxUhgsmiKmt);
-        AssertRC(rc);
+        if (g_VBoxUhgsmiKmt.BasePrivate.hClient)
+            g_VBoxCrHgsmiCallbacks.pfnClientDestroy(g_VBoxUhgsmiKmt.BasePrivate.hClient);
+        hr = vboxUhgsmiKmtDestroy(&g_VBoxUhgsmiKmt);
+        Assert(hr == S_OK);
     }
     vboxDispUnlock();
-    return rc;
+    return hr;
 }
 
@@ -803 +834 @@
 }
 
-int vboxUhgsmiGlobalSetCurrent()
-{
-    int rc = vboxUhgsmiGlobalRetain();
-    AssertRC(rc);
-    if (RT_SUCCESS(rc))
+HRESULT vboxUhgsmiGlobalSetCurrent()
+{
+    HRESULT hr = vboxUhgsmiGlobalRetain();
+    Assert(hr == S_OK);
+    if (hr == S_OK)
         vboxDispCrHgsmiClientSet(&g_VBoxUhgsmiKmt.BasePrivate);
-    return rc;
-}
-
-int vboxUhgsmiGlobalClearCurrent()
+    return hr;
+}
+
+HRESULT vboxUhgsmiGlobalClearCurrent()
 {
     vboxUhgsmiGlobalRelease();
     vboxDispCrHgsmiClientClear();
-    return VINF_SUCCESS;
+    return S_OK;
 }
 
@@ -6967 +6998 @@
         pDevice->pDevice9If->Release();
     }
+
+#ifdef VBOX_WITH_CRHGSMI
+    vboxDispLock();
+    if (pDevice->Uhgsmi.BasePrivate.hClient)
+        g_VBoxCrHgsmiCallbacks.pfnClientDestroy(pDevice->Uhgsmi.BasePrivate.hClient);
+    vboxDispUnlock();
+#endif
 
     HRESULT hr = vboxDispCmCtxDestroy(pDevice, &pDevice->DefaultContext);
@@ -7727 +7765 @@
             {
 #ifdef VBOX_WITH_CRHGSMI
-                int rc = vboxUhgsmiGlobalRetain();
-                AssertRC(rc);
-                if (RT_SUCCESS(rc))
+                hr = vboxUhgsmiGlobalRetain();
+                Assert(hr == S_OK);
+                if (hr == S_OK)
 #endif
                 {
@@ -7772 +7810 @@
 #endif
                 }
-#ifdef VBOX_WITH_CRHGSMI
-                else
-                {
-                    hr = E_FAIL;
-                }
-#endif
             } while (0);
         }

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.h

@@ -267 +267 @@
 
 #ifdef VBOX_WITH_CRHGSMI
-int vboxUhgsmiGlobalSetCurrent();
-int vboxUhgsmiGlobalClearCurrent();
+HRESULT vboxUhgsmiGlobalSetCurrent();
+HRESULT vboxUhgsmiGlobalClearCurrent();
 #endif
 

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxUhgsmiBase.h

@@ -93 +93 @@
     fLockFlags.WriteOnly = fFlags.bWriteOnly;
     fLockFlags.DonotWait = fFlags.bDonotWait;
-    fLockFlags.Discard = fFlags.bDiscard;
+//    fLockFlags.Discard = fFlags.bDiscard;
     *pfFlags = fLockFlags;
     return VINF_SUCCESS;
@@ -129 +129 @@
                   NULL, /* LPSECURITY_ATTRIBUTES lpSemaphoreAttributes */
                   0, /* LONG lInitialCount */
-                  ~0L, /* LONG lMaximumCount */
+                  (LONG)((~0UL) >> 1), /* LONG lMaximumCount */
                   NULL /* LPCTSTR lpName */
                 );
@@ -187 +187 @@
         memset(pAllocationList, 0, sizeof (D3DDDI_ALLOCATIONLIST));
         pAllocationList->hAllocation = pBuffer->hAllocation;
+        pAllocationList->Value = 0;
         pAllocationList->WriteOperation = !pBufInfo->fFlags.bHostReadOnly;
         pAllocationList->DoNotRetireInstance = pBufInfo->fFlags.bDoNotRetire;

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;