Changeset 94632 in vbox for trunk

Timestamp:

Apr 19, 2022 1:44:41 PM (3 years ago)

Author:

vboxsync

Message:

Devices/Graphics: save command buffers independently from VGPU10 when saving VM state: bugref:9830

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA.cpp (modified) (5 diffs)
• DevVGASavedState.h (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

@@ -5509 +5509 @@
 }
 
+static int vmsvgaR3LoadCommandBuffers(PPDMDEVINS pDevIns, PVGASTATE pThis, PVGASTATECC pThisCC, PSSMHANDLE pSSM)
+{
+    PCPDMDEVHLPR3 pHlp = pDevIns->pHlpR3;
+    PVMSVGAR3STATE pSvgaR3State = pThisCC->svga.pSvgaR3State;
+
+    bool f;
+    uint32_t u32;
+
+    /* Device context command buffers. */
+    int rc = vmsvgaR3LoadBufCtx(pDevIns, pThis, pThisCC, pSSM, &pSvgaR3State->CmdBufCtxDC, SVGA_CB_CONTEXT_MAX);
+    AssertLogRelRCReturn(rc, rc);
+
+    /* DX contexts command buffers. */
+    uint32_t cBufCtx;
+    rc = pHlp->pfnSSMGetU32(pSSM, &cBufCtx);
+    AssertLogRelRCReturn(rc, rc);
+    AssertReturn(cBufCtx == RT_ELEMENTS(pSvgaR3State->apCmdBufCtxs), VERR_INVALID_STATE);
+    for (uint32_t j = 0; j < cBufCtx; ++j)
+    {
+        rc = pHlp->pfnSSMGetBool(pSSM, &f);
+        AssertLogRelRCReturn(rc, rc);
+        if (f)
+        {
+            pSvgaR3State->apCmdBufCtxs[j] = (PVMSVGACMDBUFCTX)RTMemAlloc(sizeof(VMSVGACMDBUFCTX));
+            AssertPtrReturn(pSvgaR3State->apCmdBufCtxs[j], VERR_NO_MEMORY);
+            vmsvgaR3CmdBufCtxInit(pSvgaR3State->apCmdBufCtxs[j]);
+
+            rc = vmsvgaR3LoadBufCtx(pDevIns, pThis, pThisCC, pSSM, pSvgaR3State->apCmdBufCtxs[j], (SVGACBContext)j);
+            AssertLogRelRCReturn(rc, rc);
+        }
+    }
+
+    rc = pHlp->pfnSSMGetU32(pSSM, &u32);
+    pSvgaR3State->fCmdBuf = u32;
+    return rc;
+}
+
 static int vmsvgaR3LoadGbo(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, VMSVGAGBO *pGbo)
 {
@@ -5715 +5752 @@
         uint32_t u32;
 
+        if (uVersion >= VGA_SAVEDSTATE_VERSION_VMSVGA_DX_CMDBUF)
+        {
+            /* Command buffers are saved independently from VGPU10. */
+            rc = pHlp->pfnSSMGetBool(pSSM, &f);
+            AssertLogRelRCReturn(rc, rc);
+            if (f)
+            {
+                rc = vmsvgaR3LoadCommandBuffers(pDevIns, pThis, pThisCC, pSSM);
+                AssertLogRelRCReturn(rc, rc);
+            }
+        }
+
         rc = pHlp->pfnSSMGetBool(pSSM, &f);
         AssertLogRelRCReturn(rc, rc);
@@ -5721 +5770 @@
         if (pThis->fVMSVGA10)
         {
-            /* Device context command buffers. */
-            rc = vmsvgaR3LoadBufCtx(pDevIns, pThis, pThisCC, pSSM, &pSVGAState->CmdBufCtxDC, SVGA_CB_CONTEXT_MAX);
-            AssertLogRelRCReturn(rc, rc);
-
-            /* DX contexts command buffers. */
-            uint32_t cBufCtx;
-            rc = pHlp->pfnSSMGetU32(pSSM, &cBufCtx);
-            AssertLogRelRCReturn(rc, rc);
-            AssertReturn(cBufCtx == RT_ELEMENTS(pSVGAState->apCmdBufCtxs), VERR_INVALID_STATE);
-            for (uint32_t j = 0; j < cBufCtx; ++j)
-            {
-                rc = pHlp->pfnSSMGetBool(pSSM, &f);
+            if (uVersion < VGA_SAVEDSTATE_VERSION_VMSVGA_DX_CMDBUF)
+            {
+                rc = vmsvgaR3LoadCommandBuffers(pDevIns, pThis, pThisCC, pSSM);
                 AssertLogRelRCReturn(rc, rc);
-                if (f)
-                {
-                    pSVGAState->apCmdBufCtxs[j] = (PVMSVGACMDBUFCTX)RTMemAlloc(sizeof(VMSVGACMDBUFCTX));
-                    AssertPtrReturn(pSVGAState->apCmdBufCtxs[j], VERR_NO_MEMORY);
-                    vmsvgaR3CmdBufCtxInit(pSVGAState->apCmdBufCtxs[j]);
-
-                    rc = vmsvgaR3LoadBufCtx(pDevIns, pThis, pThisCC, pSSM, pSVGAState->apCmdBufCtxs[j], (SVGACBContext)j);
-                    AssertLogRelRCReturn(rc, rc);
-                }
-            }
-
-            rc = pHlp->pfnSSMGetU32(pSSM, &u32);
-            pSVGAState->fCmdBuf = u32;
+            }
 
             /*
@@ -5997 +6025 @@
 
     /*
-     * VGA_SAVEDSTATE_VERSION_VMSVGA_DX
+     * VGA_SAVEDSTATE_VERSION_VMSVGA_DX+
      */
-
-    rc = pHlp->pfnSSMPutBool(pSSM, pThis->fVMSVGA10);
-    AssertLogRelRCReturn(rc, rc);
-
-    if (pThis->fVMSVGA10)
-    {
+    if (pThis->svga.u32DeviceCaps & SVGA_CAP_COMMAND_BUFFERS)
+    {
+        rc = pHlp->pfnSSMPutBool(pSSM, true);
+        AssertLogRelRCReturn(rc, rc);
+
         /* Device context command buffers. */
         rc = vmsvgaR3SaveBufCtx(pDevIns, pSSM, &pSVGAState->CmdBufCtxDC);
@@ -6026 +6053 @@
         rc = pHlp->pfnSSMPutU32(pSSM, pSVGAState->fCmdBuf);
         AssertRCReturn(rc, rc);
-
+    }
+    else
+    {
+        rc = pHlp->pfnSSMPutBool(pSSM, false);
+        AssertLogRelRCReturn(rc, rc);
+    }
+
+    rc = pHlp->pfnSSMPutBool(pSSM, pThis->fVMSVGA10);
+    AssertLogRelRCReturn(rc, rc);
+
+    if (pThis->fVMSVGA10)
+    {
         /*
          * OTables GBOs.

trunk/src/VBox/Devices/Graphics/DevVGASavedState.h

@@ -47 +47 @@
     } while (0)
 
-#define VGA_SAVEDSTATE_VERSION                   24
+#define VGA_SAVEDSTATE_VERSION                   25
+#define VGA_SAVEDSTATE_VERSION_VMSVGA_DX_CMDBUF  25 /* Command buffers capability is not tied to VGPU10 setting. */
 #define VGA_SAVEDSTATE_VERSION_VMSVGA_DX         24 /* VGPU10. */
 #define VGA_SAVEDSTATE_VERSION_VMSVGA_MIPLEVELS  23 /* Surface struct with number of miplevels. */