Changeset 82199 in vbox

Timestamp:

Nov 25, 2019 8:54:14 PM (5 years ago)

Author:

vboxsync

Message:

DevVGA: The FIFO shouldn't be prefetchable. Workarounds for old saved state with non-prefetchable VRAM (VMSVGA). bugref:9218

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA.cpp (modified) (1 diff)
• DevVGA.cpp (modified) (9 diffs)
• DevVGA.h (modified) (2 diffs)

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

@@ -5287 +5287 @@
 
     Log(("vmsvgaR3PciIORegionFifoMapUnmap: iRegion=%d GCPhysAddress=%RGp cb=%RGp enmType=%d\n", iRegion, GCPhysAddress, cb, enmType));
-    AssertReturn(iRegion == pThis->pciRegions.iFIFO && enmType == PCI_ADDRESS_SPACE_MEM_PREFETCH, VERR_INTERNAL_ERROR);
+    AssertReturn(   iRegion == pThis->pciRegions.iFIFO
+                 && (   enmType == PCI_ADDRESS_SPACE_MEM
+                     || (enmType == PCI_ADDRESS_SPACE_MEM_PREFETCH /* got wrong in 6.1.0RC1 */ && pThis->fStateLoaded))
+                 , VERR_INTERNAL_ERROR);
     if (GCPhysAddress != NIL_RTGCPHYS)
     {

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

@@ -5612 +5612 @@
     RT_NOREF(pPciDev, cb);
 
-    AssertReturn(iRegion == pThis->pciRegions.iVRAM && enmType == PCI_ADDRESS_SPACE_MEM_PREFETCH, VERR_INTERNAL_ERROR);
+    AssertReturn(   iRegion == pThis->pciRegions.iVRAM
+                 && (   enmType == PCI_ADDRESS_SPACE_MEM_PREFETCH
+                     || (enmType == PCI_ADDRESS_SPACE_MEM && pThis->fVMSVGAEnabled && pThis->fStateLoaded))
+                 , VERR_INTERNAL_ERROR);
     Assert(pPciDev == pDevIns->apPciDevs[0]);
 
@@ -5724 +5727 @@
         if (iRegion == pThis->pciRegions.iFIFO)
         {
-            /* Make sure it's still 32-bit memory.  Ignore fluxtuations in the prefetch flag */
+            /* Make sure it's still 32-bit memory.  Ignore fluxtuations in the prefetch flag. */
             AssertLogRelMsgReturn(!(enmType & (PCI_ADDRESS_SPACE_IO | PCI_ADDRESS_SPACE_BAR64)), ("enmType=%#x\n", enmType),
                                   VERR_VGA_UNEXPECTED_PCI_REGION_LOAD_CHANGE);
@@ -5749 +5752 @@
         }
 
+        /*
+         * VRAM used to be non-prefetchable till 6.1.0, so we end up here when restoring
+         * states older than that with 6.1.0 and later.  We just have to check that
+         * the size and basic type matches, then return VINF_SUCCESS to ACK it.
+         */
+        if (iRegion == pThis->pciRegions.iVRAM)
+        {
+            /* Make sure it's still 32-bit memory.  Ignore fluxtuations in the prefetch flag. */
+            AssertLogRelMsgReturn(!(enmType & (PCI_ADDRESS_SPACE_IO | PCI_ADDRESS_SPACE_BAR64)), ("enmType=%#x\n", enmType),
+                                  VERR_VGA_UNEXPECTED_PCI_REGION_LOAD_CHANGE);
+            /* The size must be the same. */
+            AssertLogRelMsgReturn(cbRegion == pThis->vram_size,
+                                  ("cbRegion=%#RGp vram_size=%#x\n", cbRegion, pThis->vram_size),
+                                  VERR_SSM_LOAD_CONFIG_MISMATCH);
+            return VINF_SUCCESS;
+        }
+
         /* Emulate callbacks for 5.1 and older saved states by recursion. */
         if (iRegion == UINT32_MAX)
@@ -5808 +5828 @@
 }
 
+
 /**
  * @callback_method_impl{FNSSMDEVSAVEDONE}
@@ -5821 +5842 @@
 # endif
 }
+
 
 /**
@@ -5877 +5899 @@
 
 /**
+ * @callback_method_impl{FNSSMDEVLOADPREP}
+ */
+static DECLCALLBACK(int) vgaR3LoadPrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
+{
+    PVGASTATE pThis = PDMDEVINS_2_DATA(pDevIns, PVGASTATE);
+    RT_NOREF(pSSM);
+    pThis->fStateLoaded = true;
+    return VINF_SUCCESS;
+}
+
+
+/**
  * @callback_method_impl{FNSSMDEVLOADEXEC}
  */
@@ -5885 +5919 @@
     PCPDMDEVHLPR3   pHlp    = pDevIns->pHlpR3;
     int             rc;
+
+    pThis->fStateLoaded = true;
 
     if (uVersion < VGA_SAVEDSTATE_VERSION_ANCIENT || uVersion > VGA_SAVEDSTATE_VERSION)
@@ -6587 +6623 @@
 
         rc = PDMDevHlpPCIIORegionCreateMmio2Ex(pDevIns, pThis->pciRegions.iFIFO, pThis->svga.cbFIFO,
-                                               PCI_ADDRESS_SPACE_MEM_PREFETCH, 0 /*fFlags*/, vmsvgaR3PciIORegionFifoMapUnmap,
+                                               PCI_ADDRESS_SPACE_MEM, 0 /*fFlags*/, vmsvgaR3PciIORegionFifoMapUnmap,
                                                "VMSVGA-FIFO", (void **)&pThisCC->svga.pau32FIFO, &pThis->hMmio2VmSvgaFifo);
         AssertRCReturn(rc, PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
@@ -6796 +6832 @@
                                 NULL,          vgaR3LiveExec, NULL,
                                 vgaR3SavePrep, vgaR3SaveExec, vgaR3SaveDone,
-                                NULL,          vgaR3LoadExec, vgaR3LoadDone);
+                                vgaR3LoadPrep, vgaR3LoadExec, vgaR3LoadDone);
     AssertRCReturn(rc, rc);
 

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

@@ -362 +362 @@
     /** Whether 3D is enabled for the VM. */
     bool                        f3DEnabled;
+    /** Set if state has been restored. */
+    bool                        fStateLoaded;
 #ifdef VBOX_WITH_VMSVGA
     /* Whether the SVGA emulation is enabled or not. */
@@ -367 +369 @@
     bool                        fVMSVGAPciId;
     bool                        fVMSVGAPciBarLayout;
-    bool                        Padding4[4];
+    bool                        Padding4[3];
 #else
-    bool                        Padding4[3+4];
+    bool                        Padding4[3+3];
 #endif