Changeset 94635 in vbox

Timestamp:

Apr 19, 2022 3:26:18 PM (3 years ago)

Author:

vboxsync

Message:

WDDM: cleanup routines; submit pending buffers. bugref:9845

Location:

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

Files:

• Svga.cpp (modified) (4 diffs)
• Svga.h (modified) (1 diff)
• SvgaFifo.cpp (modified) (4 diffs)

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

@@ -55 +55 @@
 }
 
+static NTSTATUS SvgaObjectTablesDestroy(VBOXWDDM_EXT_VMSVGA *pSvga)
+{
+    NTSTATUS Status = STATUS_SUCCESS;
+    if (pSvga->hMemObjOTables != NIL_RTR0MEMOBJ)
+    {
+        for (uint32_t idOTable = 0; idOTable < SVGA_OTABLE_DX_MAX; idOTable++)
+        {
+            void *pvCmd = SvgaCmdBuf3dCmdReserve(pSvga, SVGA_3D_CMD_SET_OTABLE_BASE64, sizeof(SVGA3dCmdSetOTableBase64), SVGA3D_INVALID_ID);
+            AssertBreakStmt(pvCmd, STATUS_INSUFFICIENT_RESOURCES);
+
+            SVGA3dCmdSetOTableBase64 *pCmd = (SVGA3dCmdSetOTableBase64 *)pvCmd;
+            pCmd->type             = (SVGAOTableType)idOTable;
+            pCmd->baseAddress      = 0;
+            pCmd->sizeInBytes      = 0;
+            pCmd->validSizeInBytes = 0;
+            pCmd->ptDepth          = SVGA3D_MOBFMT_INVALID;
+
+            SvgaCmdBufCommit(pSvga, sizeof(SVGA3dCmdSetOTableBase64));
+        }
+
+        if (NT_SUCCESS(Status))
+            SvgaCmdBufFlush(pSvga);
+
+        int rc = RTR0MemObjFree(pSvga->hMemObjOTables, true);
+        AssertRCStmt(rc, Status = STATUS_INVALID_PARAMETER);
+        pSvga->hMemObjOTables = NIL_RTR0MEMOBJ;
+    }
+    return Status;
+}
 
 static NTSTATUS svgaCBContextEnable(VBOXWDDM_EXT_VMSVGA *pSvga, SVGACBContext CBContext, bool fEnable)
@@ -70 +99 @@
 }
 
-
-static NTSTATUS svgaHwInit(VBOXWDDM_EXT_VMSVGA *pSvga)
+static void svgaHwStop(VBOXWDDM_EXT_VMSVGA *pSvga)
+{
+    /* Undo svgaHwStart. */
+
+    /* Send commands to host. */
+    if (pSvga->u32Caps & SVGA_CAP_GBOBJECTS)
+        SvgaObjectTablesDestroy(pSvga);
+
+    /* Give the host some time to process them. */
+    LARGE_INTEGER Interval;
+    Interval.QuadPart = -(int64_t)100 /* ms */ * 10000;
+    KeDelayExecutionThread(KernelMode, FALSE, &Interval);
+
+    /* Disable IRQs. */
+    SVGARegWrite(pSvga, SVGA_REG_IRQMASK, 0);
+
+    if (pSvga->pCBState)
+        svgaCBContextEnable(pSvga, SVGA_CB_CONTEXT_0, false);
+
+    /* Disable SVGA. */
+    SVGARegWrite(pSvga, SVGA_REG_ENABLE, SVGA_REG_ENABLE_DISABLE);
+
+    if (pSvga->u32Caps & SVGA_CAP_COMMAND_BUFFERS)
+        SvgaCmdBufDestroy(pSvga);
+}
+
+static NTSTATUS svgaHwStart(VBOXWDDM_EXT_VMSVGA *pSvga)
 {
     pSvga->u32Caps      = SVGARegRead(pSvga, SVGA_REG_CAPABILITIES);
@@ -163 +217 @@
         }
 
-        /** @todo svgaHwStop(VBOXWDDM_EXT_VMSVGA *pSvga) to undo svgaHwInit */
-        if (pSvga->u32Caps & SVGA_CAP_COMMAND_BUFFERS)
-        {
-            /// @todo SvgaObjectTablesDestroy(pSvga);
-            SvgaCmdBufDestroy(pSvga);
-        }
-
-        /* Disable SVGA device. */
-        SVGARegWrite(pSvga, SVGA_REG_IRQMASK, 0);
-        SVGARegWrite(pSvga, SVGA_REG_ENABLE, SVGA_REG_ENABLE_DISABLE);
+        svgaHwStop(pSvga);
 
         Status = pDxgkInterface->DxgkCbUnmapMemory(pDxgkInterface->DeviceHandle,
@@ -223 +268 @@
         if (u32SvgaId == SVGA_ID_2)
         {
-            Status = svgaHwInit(pSvga);
-
+            Status = svgaHwStart(pSvga);
             if (NT_SUCCESS(Status))
             {

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

@@ -124 +124 @@
     RTLISTANCHOR         QueuePending;             /* Buffers which will be submitted to the host. */
     RTLISTANCHOR         QueueSubmitted;           /* Buffers which are being processed by the host. */
-    RTLISTANCHOR         QueuePreempted;           /* Preempted buffers. */
     uint32_t             cSubmitted;               /* How many buffers were submitted to the host.
                                                     * Less than SVGA_CB_MAX_QUEUED_PER_CONTEXT */

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

@@ -785 +785 @@
             --pCBCtx->cSubmitted;
         }
+
+        /* Try to submit pending buffers. */
+        while (!RTListIsEmpty(&pCBCtx->QueuePending))
+        {
+            if (pCBCtx->cSubmitted >= SVGA_CB_MAX_QUEUED_PER_CONTEXT - 1)
+                break;
+
+            PVMSVGACB pCB = RTListGetFirst(&pCBCtx->QueuePending, VMSVGACB, nodeQueue);
+            RTListNodeRemove(&pCB->nodeQueue);
+
+            RTListAppend(&pCBCtx->QueueSubmitted, &pCB->nodeQueue);
+            ++pCBCtx->cSubmitted;
+            svgaCBSubmitHeader(pSvga, pCB->CBHeaderPhysAddr, (SVGACBContext)i);
+            GALOG(("Submitted pending %p\n", pCB));
+        }
     }
     KeReleaseSpinLock(&pCBState->SpinLock, OldIrql);
@@ -828 +843 @@
 NTSTATUS SvgaCmdBufDestroy(PVBOXWDDM_EXT_VMSVGA pSvga)
 {
-    /** @todo implement */
     PVMSVGACBSTATE pCBState = pSvga->pCBState;
     if (pCBState == NULL)
@@ -834 +848 @@
     pSvga->pCBState = NULL;
 
+    for (unsigned i = 0; i < RT_ELEMENTS(pCBState->aCBContexts); ++i)
+    {
+        PVMSVGACBCONTEXT pCBCtx = &pCBState->aCBContexts[i];
+        PVMSVGACB pIter, pNext;
+        RTListForEachSafe(&pCBCtx->QueueSubmitted, pIter, pNext, VMSVGACB, nodeQueue)
+        {
+            RTListNodeRemove(&pIter->nodeQueue);
+            svgaCBFree(pCBState, pIter);
+        }
+        RTListForEachSafe(&pCBCtx->QueuePending, pIter, pNext, VMSVGACB, nodeQueue)
+        {
+            RTListNodeRemove(&pIter->nodeQueue);
+            svgaCBFree(pCBState, pIter);
+        }
+    }
+
+    if (pCBState->pCBCurrent)
+    {
+        svgaCBFree(pCBState, pCBState->pCBCurrent);
+        pCBState->pCBCurrent = NULL;
+    }
+
+    svgaCBHeaderPoolDestroy(&pCBState->HeaderPool);
+
     GaMemFree(pCBState);
     return STATUS_SUCCESS;
@@ -851 +889 @@
         RTListInit(&pCBCtx->QueuePending);
         RTListInit(&pCBCtx->QueueSubmitted);
-        RTListInit(&pCBCtx->QueuePreempted);
         //pCBCtx->cSubmitted = 0;
     }