Changeset 80482 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Aug 28, 2019 3:53:17 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

132975

Message:

WDDM: remove Gallium driver dependency on CmdVbva. bugref:9529

Location:

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

Files:

• common/VBoxMPDevExt.h (modified) (2 diffs)
• wddm/VBoxMPWddm.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPDevExt.h

@@ -225 +225 @@
 #endif
 
+   ULONG cbVRAMCpuVisible;                     /* How much video memory is available for the CPU visible segment. */
 } VBOXMP_DEVEXT, *PVBOXMP_DEVEXT;
 
@@ -244 +245 @@
 DECLINLINE(ULONG) vboxWddmVramCpuVisibleSize(PVBOXMP_DEVEXT pDevExt)
 {
-#ifdef VBOX_WITH_CROGL
-    if (pDevExt->fCmdVbvaEnabled)
-    {
-        /* all memory layout info should be initialized */
-        Assert(pDevExt->CmdVbva.Vbva.offVRAMBuffer);
-        /* page aligned */
-        Assert(!(pDevExt->CmdVbva.Vbva.offVRAMBuffer & 0xfff));
-
-        return (ULONG)(pDevExt->CmdVbva.Vbva.offVRAMBuffer & ~0xfffULL);
-    }
-#endif
-    /* all memory layout info should be initialized */
-    Assert(pDevExt->aSources[0].Vbva.Vbva.offVRAMBuffer);
-    /* page aligned */
-    Assert(!(pDevExt->aSources[0].Vbva.Vbva.offVRAMBuffer & 0xfff));
-
-    return (ULONG)(pDevExt->aSources[0].Vbva.Vbva.offVRAMBuffer & ~0xfffULL);
+    return pDevExt->cbVRAMCpuVisible;
 }
 

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

@@ -883 +883 @@
 #endif
 
+        /* vboxWddmVramCpuVisibleSize uses this value */
+        pDevExt->cbVRAMCpuVisible = offset;
+
         rc = VBoxMPCmnMapAdapterMemory(VBoxCommonFromDeviceExt(pDevExt), (void**)&pDevExt->pvVisibleVram,
                                        0, vboxWddmVramCpuVisibleSize(pDevExt));
@@ -903 +906 @@
                             - VBVA_ADAPTER_INFORMATION_SIZE;
 
-    /* Size of the VBVA buffer which is used to pass VBOXCMDVBVA_* commands to the host.
-     * Estimate max 4KB per command.
-     */
-    ULONG cbCmdVbva = VBOXCMDVBVA_BUFFERSIZE(4096);
-
-    if (cbCmdVbva >= cbAvailable)
-    {
-        WARN(("too few VRAM memory fatal, %d, requested for CmdVbva %d", cbAvailable, cbCmdVbva));
+    /* vboxWddmVramCpuVisibleSize uses this value */
+    pDevExt->cbVRAMCpuVisible = cbAvailable;
+
+    int rc = VBoxMPCmnMapAdapterMemory(VBoxCommonFromDeviceExt(pDevExt), (void**)&pDevExt->pvVisibleVram,
+                                   0, vboxWddmVramCpuVisibleSize(pDevExt));
+    if (RT_FAILURE(rc))
+    {
+        WARN(("VBoxMPCmnMapAdapterMemory failed, rc %d", rc));
         return STATUS_UNSUCCESSFUL;
     }
 
-
-    ULONG offCmdVbva = cbAvailable - cbCmdVbva;
-
-/// @todo The Gallium 3D driver (which still needs pDevExt->fCmdVbvaEnabled == true) does not (should not) use CmdVbva.
-///       But we still have to create the Vbva structure because code elsewhere in the driver depends on it,
-///       for example vboxWddmVramCpuVisibleSize. CmdVbva will be removed eventually.
-    int rc = VBoxCmdVbvaCreate(pDevExt, &pDevExt->CmdVbva, offCmdVbva, cbCmdVbva);
-    if (RT_SUCCESS(rc))
-    {
-// Do not actually send the request to the host, because the Gallium driver does not need this.
-//        rc = VBoxCmdVbvaEnable(pDevExt, &pDevExt->CmdVbva);
-//        if (RT_SUCCESS(rc))
-//        {
-            rc = VBoxMPCmnMapAdapterMemory(VBoxCommonFromDeviceExt(pDevExt), (void**)&pDevExt->pvVisibleVram,
-                                           0, vboxWddmVramCpuVisibleSize(pDevExt));
-            if (RT_SUCCESS(rc))
-                return STATUS_SUCCESS;
-            else
-                WARN(("VBoxMPCmnMapAdapterMemory failed, rc %d", rc));
-
-//            VBoxCmdVbvaDisable(pDevExt, &pDevExt->CmdVbva);
-//        }
-//        else
-//            WARN(("VBoxCmdVbvaEnable failed, rc %d", rc));
-
-        VBoxCmdVbvaDestroy(pDevExt, &pDevExt->CmdVbva);
-    }
-    else
-        WARN(("VBoxCmdVbvaCreate failed, rc %d", rc));
-
-    return STATUS_UNSUCCESSFUL;
+    return STATUS_SUCCESS;
 }
 #endif
@@ -971 +944 @@
         VBoxMPCmnUnmapAdapterMemory(VBoxCommonFromDeviceExt(pDevExt), (void**)&pDevExt->pvVisibleVram);
 
-    if (pDevExt->fCmdVbvaEnabled)
-    {
-//        rc = VBoxCmdVbvaDisable(pDevExt, &pDevExt->CmdVbva);
-//        if (RT_SUCCESS(rc))
-//        {
-//            rc = VBoxCmdVbvaDestroy(pDevExt, &pDevExt->CmdVbva);
-//            if (RT_FAILURE(rc))
-//                WARN(("VBoxCmdVbvaDestroy failed %d", rc));
-//        }
-//        else
-//            WARN(("VBoxCmdVbvaDestroy failed %d", rc));
-
-    }
-    else
+    if (!pDevExt->fCmdVbvaEnabled)
     {
         for (int i = VBoxCommonFromDeviceExt(pDevExt)->cDisplays-1; i >= 0; --i)