Changeset 94927 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/gallium/Svga.cpp

Timestamp:

May 9, 2022 6:48:47 AM (3 years ago)

Author:

vboxsync

Message:

WDDM: Fill and DiscardContent paging operations; various fixes. bugref:9845

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/gallium/Svga.cpp (modified) (6 diffs)

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

@@ -1965 +1965 @@
 
     NTSTATUS Status;
+    AssertCompile(NIL_RTR0MEMOBJ == 0);
 
     *ppMob = (PVMSVGAMOB)GaMemAllocZero(sizeof(VMSVGAMOB));
@@ -1986 +1987 @@
         ExReleaseFastMutex(&pSvga->SvgaMutex);
 
-        if (pMob->hMemObj)
-        {
-            int rc = RTR0MemObjFree(pMob->hMemObj, true);
+        if (pMob->hMemObjPT != NIL_RTR0MEMOBJ)
+        {
+            int rc = RTR0MemObjFree(pMob->hMemObjPT, true);
             AssertRC(rc);
+            pMob->hMemObjPT = NIL_RTR0MEMOBJ;
         }
 
@@ -2035 +2037 @@
     if (pMob->cDescriptionPages)
     {
-        int rc = RTR0MemObjAllocPageTag(&pMob->hMemObj, pMob->cDescriptionPages * PAGE_SIZE,
+        int rc = RTR0MemObjAllocPageTag(&pMob->hMemObjPT, pMob->cDescriptionPages * PAGE_SIZE,
                                         false /* executable R0 mapping */, "VMSVGAMOB");
         AssertRCReturnStmt(rc, SvgaMobFree(pSvga, pMob), STATUS_INSUFFICIENT_RESOURCES);
@@ -2044 +2046 @@
              * Skip the level 2 page at index 0.
              */
-            PPN64 *paPpn = (PPN64 *)RTR0MemObjAddress(pMob->hMemObj);
+            PPN64 *paPpn = (PPN64 *)RTR0MemObjAddress(pMob->hMemObjPT);
             for (unsigned i = 1; i < pMob->cDescriptionPages; ++i)
-                paPpn[i - 1] = RTR0MemObjGetPagePhysAddr(pMob->hMemObj, i) >> PAGE_SHIFT;
+                paPpn[i - 1] = RTR0MemObjGetPagePhysAddr(pMob->hMemObjPT, i) >> PAGE_SHIFT;
         }
     }
@@ -2072 +2074 @@
     {
         /* The first of pages is alway the base. It is either the level 2 page or the single level 1 page */
-        pMob->base = RTR0MemObjGetPagePhysAddr(pMob->hMemObj, 0) >> PAGE_SHIFT;
-
-        PPN64 *paPpn = (PPN64 *)RTR0MemObjAddress(pMob->hMemObj);
+        pMob->base = RTR0MemObjGetPagePhysAddr(pMob->hMemObjPT, 0) >> PAGE_SHIFT;
+
+        PPN64 *paPpn = (PPN64 *)RTR0MemObjAddress(pMob->hMemObjPT);
         PPN64 *paPpnMdlPfn;
         if (pMob->enmMobFormat == SVGA3D_MOBFMT_PTDEPTH64_2)
@@ -2102 +2104 @@
     {
         /* The first of pages is alway the base. It is either the level 2 page or the single level 1 page */
-        pMob->base = RTR0MemObjGetPagePhysAddr(pMob->hMemObj, 0) >> PAGE_SHIFT;
-
-        PPN64 *paPpn = (PPN64 *)RTR0MemObjAddress(pMob->hMemObj);
+        pMob->base = RTR0MemObjGetPagePhysAddr(pMob->hMemObjPT, 0) >> PAGE_SHIFT;
+
+        PPN64 *paPpn = (PPN64 *)RTR0MemObjAddress(pMob->hMemObjPT);
         PPN64 *paPpnMob;
         if (pMob->enmMobFormat == SVGA3D_MOBFMT_PTDEPTH64_2)