Changeset 83280 in vbox for trunk/src/VBox

Timestamp:

Mar 13, 2020 12:19:26 PM (5 years ago)

Author:

vboxsync

Message:

VMSVGA: Do not needlessly register VGA LFB handler when updating framebuffer mapping.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA.cpp (modified) (1 diff)

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

@@ -5643 +5643 @@
         if (RT_SUCCESS(rc))
         {
-            rc = PGMHandlerPhysicalRegister(PDMDevHlpGetVM(pDevIns), GCPhysAddress, GCPhysAddress + (pThis->vram_size - 1),
-                                            pThis->hLfbAccessHandlerType, pDevIns, pDevIns->pDevInsR0RemoveMe,
-                                            pDevIns->pDevInsForRC, "VGA LFB");
-            AssertLogRelRC(rc);
-            if (RT_SUCCESS(rc))
+# ifdef VBOX_WITH_VMSVGA
+            Assert(!pThis->svga.fEnabled || !pThis->svga.fVRAMTracking);
+            if (    !pThis->svga.fEnabled
+                ||  (   pThis->svga.fEnabled
+                     && pThis->svga.fVRAMTracking
+                    )
+               )
+# endif
             {
-                pThis->GCPhysVRAM = GCPhysAddress;
-                pThis->vbe_regs[VBE_DISPI_INDEX_FB_BASE_HI] = GCPhysAddress >> 16;
+                rc = PGMHandlerPhysicalRegister(PDMDevHlpGetVM(pDevIns), GCPhysAddress, GCPhysAddress + (pThis->vram_size - 1),
+                                                pThis->hLfbAccessHandlerType, pDevIns, pDevIns->pDevInsR0RemoveMe,
+                                                pDevIns->pDevInsForRC, "VGA LFB");
+                AssertLogRelRC(rc);
             }
+
+            pThis->GCPhysVRAM = GCPhysAddress;
+            pThis->vbe_regs[VBE_DISPI_INDEX_FB_BASE_HI] = GCPhysAddress >> 16;
+
             rc = VINF_PCI_MAPPING_DONE; /* caller doesn't care about any other status, so no problem overwriting error here */
         }