Changeset 105182 in vbox

Timestamp:

Jul 8, 2024 11:44:04 AM (5 months ago)

Author:

vboxsync

Message:

Devices/Graphics: screens handling cleanup. bugref:10708

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA-cmd.cpp (modified) (4 diffs)
• DevVGA-SVGA.cpp (modified) (4 diffs)

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

@@ -1940 +1940 @@
         pScreen->cbPitch = pCmd->width * 4;
         pScreen->cBpp    = 32;
+        pScreen->cDpi    = pCmd->dpi;
+
+        /* The screen bitmap must be deallocated after 'vmsvgaR3ChangeMode'. */
+        void *pvOldScreenBitmap = pScreen->pvScreenBitmap;
+        pScreen->pvScreenBitmap = 0;
 
         if (RT_LIKELY(pThis->svga.f3DEnabled))
@@ -1952 +1957 @@
         pThis->svga.fGFBRegisters = false;
         vmsvgaR3ChangeMode(pThis, pThisCC);
+
+        RTMemFree(pvOldScreenBitmap);
     }
 }
@@ -7699 +7706 @@
     VMSVGASCREENOBJECT *pScreen = &pSvgaR3State->aScreens[idScreen];
     Assert(pScreen->idScreen == idScreen);
+    pScreen->cDpi      = 0; /* SVGAFifoCmdDefineScreen does not support dpi. */
+
+    /* SVGAFifoCmdDefineScreen uses the guest VRAM. The screen bitmap must be deallocated after 'vmsvgaR3ChangeMode'. */
+    void *pvOldScreenBitmap = pScreen->pvScreenBitmap;
+    pScreen->pvScreenBitmap = 0;
+
     pScreen->fDefined  = true;
     pScreen->fModified = true;
@@ -7721 +7734 @@
     }
 
-    pThis->svga.fGFBRegisters = false;
-    vmsvgaR3ChangeMode(pThis, pThisCC);
-
 #ifdef VBOX_WITH_VMSVGA3D
     if (RT_LIKELY(pThis->svga.f3DEnabled))
         vmsvga3dDefineScreen(pThis, pThisCC, pScreen);
 #endif
+
+    pThis->svga.fGFBRegisters = false;
+    vmsvgaR3ChangeMode(pThis, pThisCC);
+
+    RTMemFree(pvOldScreenBitmap);
 }
 

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

@@ -1683 +1683 @@
         VMSVGASCREENOBJECT *pScreen = &pSVGAState->aScreens[0];
         Assert(pScreen->idScreen == 0);
+
+        if (   pScreen->cWidth  == VMSVGA_VAL_UNINITIALIZED
+            || pScreen->cHeight == VMSVGA_VAL_UNINITIALIZED
+            || pScreen->cBpp    == VMSVGA_VAL_UNINITIALIZED)
+        {
+            /* Do not apply the change if the guest has not finished updating registers.
+             * This is necessary in order to make a full mode change, including freeing
+             * pvScreenBitmap buffers for screen 0 if necessary.
+             */
+            return VINF_SUCCESS;
+        }
+
+        /* Remember screen bitmap buffers to be freed. */
+        void * apvOldScreenBitmap[RT_ELEMENTS(pSVGAState->aScreens)];
+        RT_ZERO(apvOldScreenBitmap);
+
         pScreen->fDefined  = true;
         pScreen->fModified = true;
@@ -1693 +1709 @@
         pScreen->cHeight   = pThis->svga.uHeight;
         pScreen->cBpp      = pThis->svga.uBpp;
+        pScreen->cDpi      = 0; /* GFB mode does not support dpi. */
+        /* GFB mode uses the guest VRAM. The screen bitmap must be deallocated after 'vmsvgaR3VBVAResize'. */
+        apvOldScreenBitmap[0] = pScreen->pvScreenBitmap;
+        /* Set pvScreenBitmap to zero because if it is not, then vmsvgaR3VBVAResize uses it as VRAM address. */
+        pScreen->pvScreenBitmap = 0;
 
         for (unsigned iScreen = 1; iScreen < RT_ELEMENTS(pSVGAState->aScreens); ++iScreen)
@@ -1702 +1723 @@
                 pScreen->fModified = true;
                 pScreen->fDefined = false;
-            }
-        }
+
+#ifdef VBOX_WITH_VMSVGA3D
+                if (RT_LIKELY(pThis->svga.f3DEnabled))
+                    vmsvga3dDestroyScreen(pThisCC, pScreen);
+#endif
+                apvOldScreenBitmap[iScreen] = pScreen->pvScreenBitmap;
+                pScreen->pvScreenBitmap = 0;
+            }
+        }
+
+        vmsvgaR3VBVAResize(pThis, pThisCC);
+
+        /* Deallocate screen bitmaps for all screens because GFB mode uses the guest VRAM. */
+        for (unsigned iScreen = 0; iScreen < RT_ELEMENTS(apvOldScreenBitmap); ++iScreen)
+            RTMemFree(apvOldScreenBitmap[iScreen]);
     }
     else
@@ -1714 +1748 @@
         pThis->svga.uHeight = VMSVGA_VAL_UNINITIALIZED;
         pThis->svga.uBpp    = pThis->svga.uHostBpp;
-    }
-
-    vmsvgaR3VBVAResize(pThis, pThisCC);
+
+        vmsvgaR3VBVAResize(pThis, pThisCC);
+    }
 
     /* Last stuff. For the VGA device screenshot. */