Changeset 90180 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 14, 2021 12:05:26 PM (4 years ago)

Author:

vboxsync

Message:

3D/VMSVGA: The command buffer context init/cleanup on device start/stop, bugref:9845

Location:

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

Files:

• Svga.cpp (modified) (3 diffs)
• Svga.h (modified) (1 diff)

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

@@ -27 +27 @@
 #include <iprt/memobj.h>
 
+static NTSTATUS SvgaCmdBufCtxInit(VBOXWDDM_EXT_VMSVGA *pSvga, bool enable)
+{
+    int rc = STATUS_SUCCESS;
+
+    if (enable)
+    {
+        rc = RTR0MemObjAllocPageTag(&pSvga->hMemObj, 2 << PAGE_SHIFT,
+                                false /* executable R0 mapping */, "WDDMGA");
+
+        pSvga->pvR0Hdr = RTR0MemObjAddress(pSvga->hMemObj);
+        pSvga->paHdr   = RTR0MemObjGetPagePhysAddr(pSvga->hMemObj, 0/*iPage*/);
+
+        pSvga->pvR0Cmd = (uint8_t *)pSvga->pvR0Hdr + PAGE_SIZE;
+        pSvga->paCmd   = RTR0MemObjGetPagePhysAddr(pSvga->hMemObj, 1/*iPage*/);
+    }
+
+    SVGACBHeader *pHdr = (SVGACBHeader *)pSvga->pvR0Hdr;
+
+    pHdr->status = SVGA_CB_STATUS_NONE;
+    pHdr->errorOffset = 0;
+    pHdr->id = 0;
+    pHdr->flags = SVGA_CB_FLAG_NONE;
+    pHdr->length = sizeof(uint32_t) + sizeof(SVGADCCmdStartStop);
+    pHdr->ptr.pa = pSvga->paCmd;
+
+    uint32_t *pu32Id = (uint32_t *)pSvga->pvR0Cmd;
+    SVGADCCmdStartStop *pCommand = (SVGADCCmdStartStop *)&pu32Id[1];
+
+    *pu32Id = SVGA_DC_CMD_START_STOP_CONTEXT;
+    pCommand->enable = enable;
+    pCommand->context = SVGA_CB_CONTEXT_0;
+
+    SVGARegWrite(pSvga, SVGA_REG_COMMAND_HIGH, (uint32_t)(pSvga->paHdr >> 32));
+    SVGARegWrite(pSvga, SVGA_REG_COMMAND_LOW, (uint32_t)pSvga->paHdr | 0x3f);
+
+    if (!enable)
+    {
+        RTR0MemObjFree(pSvga->hMemObj, true);
+        pSvga->hMemObj = NIL_RTR0MEMOBJ;
+    }
+
+    return rc;
+}
+
 static NTSTATUS svgaHwInit(VBOXWDDM_EXT_VMSVGA *pSvga)
 {
@@ -70 +114 @@
     }
 
+    if (pSvga->u32Caps & SVGA_CAP_COMMAND_BUFFERS)
+    {
+        SvgaCmdBufCtxInit(pSvga, true);
+    }
+
     return Status;
 }
@@ -95 +144 @@
             pSvga->pu32GMRBits = NULL;
             pSvga->cbGMRBits = 0;
+        }
+
+        if (pSvga->u32Caps & SVGA_CAP_COMMAND_BUFFERS)
+        {
+            SvgaCmdBufCtxInit(pSvga, false);
         }
 

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

@@ -64 +64 @@
     /** Pointer to FIFO MMIO region. */
     volatile uint32_t *pu32FIFO;
+
+    RTR0MEMOBJ hMemObj;
+    RTR0PTR  pvR0Hdr, pvR0Cmd;
+    RTHCPHYS paHdr, paCmd;
 
     /**