Changeset 104846 in vbox for trunk/src

Timestamp:

Jun 5, 2024 2:08:09 AM (8 months ago)

Author:

vboxsync

Message:

include/VBox,Main,DevVGA: Folded VBox/graphics.h into VBox/param.h and restored svga_reg.h to its vanilla state. bugref:10693

Location:

trunk/src/VBox

Files:

• Devices/Graphics/DevVGA.h (modified) (1 diff)
• Devices/Graphics/vmsvga_include/svga_reg.h (modified) (2 diffs)
• Main/src-all/PlatformPropertiesImpl.cpp (modified) (3 diffs)

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

@@ -72 +72 @@
 #endif
 
-#include <VBox/graphics.h> /* For VRAM ranges. */
+#include <VBox/param.h> /* For VRAM ranges. */
+#ifdef VBOX_WITH_VMSVGA
+/* Make sure the param.h copy of the SVGA VRAM sizes matches the originals. */
+AssertCompile(VBOX_SVGA_VRAM_MIN_SIZE    == SVGA_VRAM_MIN_SIZE);
+AssertCompile(VBOX_SVGA_VRAM_MIN_SIZE_3D == SVGA_VRAM_MIN_SIZE_3D);
+AssertCompile(VBOX_SVGA_VRAM_MAX_SIZE    == SVGA_VRAM_MAX_SIZE);
+#endif
 
 #include <iprt/list.h>

trunk/src/VBox/Devices/Graphics/vmsvga_include/svga_reg.h

@@ -41 +41 @@
 
 #include "svga_types.h"
-
-#include <VBox/graphics.h> /* For VRAM ranges. */
 
 /*
@@ -2270 +2268 @@
  * Size of SVGA device memory such as frame buffer and FIFO.
  */
+#define SVGA_VRAM_MIN_SIZE             (4 * 640 * 480) /* bytes */
+#define SVGA_VRAM_MIN_SIZE_3D       (16 * 1024 * 1024)
+#define SVGA_VRAM_MAX_SIZE         (128 * 1024 * 1024)
 #define SVGA_MEMORY_SIZE_MAX      (1024 * 1024 * 1024)
 #define SVGA_FIFO_SIZE_MAX           (2 * 1024 * 1024)

trunk/src/VBox/Main/src-all/PlatformPropertiesImpl.cpp

@@ -34 +34 @@
 #include <iprt/cpp/utils.h>
 
-#include <VBox/graphics.h> /* For VRAM ranges. */
+#include <VBox/param.h> /* For VRAM ranges. */
 #include <VBox/settings.h>
 
@@ -847 +847 @@
     {
         case GraphicsControllerType_VBoxVGA:
-        {
             cbMin = VGA_VRAM_MIN;
             cbMax = VGA_VRAM_MAX;
             break;
-        }
 
         case GraphicsControllerType_VMSVGA:
-        {
             cbMin = VGA_VRAM_MIN;
             cbMax = VGA_VRAM_MAX;
             break;
-        }
-
+
+/** @todo r=bird: I think this is wrong.  The VMSVGA variant is the one that
+ *        is trying to be the most compatible with the original HW (same PCI
+ *        IDs etc). So, I don't see why we're subjecting VBoxSVGA to the SVGA
+ *        limitations and the original VMSVGA variant to the VBox/VGA ones.
+ *
+ *        Other than the higher minimum values compared to VGA_VRAM_MIN,
+ *        I'm not sure we need to care too much about restricting the MAX to
+ *        128MB for either VMSVGA nor VBoxSVGA.  We should be using
+ *        VGA_VRAM_MAX for all three. */
         case GraphicsControllerType_VBoxSVGA:
-        {
 #ifdef VBOX_WITH_VMSVGA
 # ifdef VBOX_WITH_VMSVGA3D
             if (fAccelerate3DEnabled)
-                cbMin = SVGA_VRAM_MIN_SIZE_3D;
+                cbMin = VBOX_SVGA_VRAM_MIN_SIZE_3D;
             else
-# endif /* VBOX_WITH_VMSVGA3D */
-                cbMin = SVGA_VRAM_MIN_SIZE;
-            cbMax = SVGA_VRAM_MAX_SIZE;
+# endif
+                cbMin = VBOX_SVGA_VRAM_MIN_SIZE;
+            cbMax = VBOX_SVGA_VRAM_MAX_SIZE;
+            break;
 #else
             return VBOX_E_NOT_SUPPORTED;
 #endif
-            break;
-        }
 
         case GraphicsControllerType_QemuRamFB:
-        {
             /* We seem to hardcode 32-bit (4 bytes) as BPP, see RAMFB_BPP in QemuRamfb.c. */
             cbMin = 4 /* BPP in bytes */ * 16    * 16;    /* Values taken from qemu/hw/display/ramfb.c */
             cbMax = 4 /* BPP in bytes */ * 16000 * 12000; /* Values taken from bochs-vbe.h. */
             break;
-        }
 
         default:
@@ -893 +894 @@
     cbStride = (ULONG)cbStride / _1M;
 
+    /** @todo r=bird: Why this? Why do these have to be powers of two?
+     * The algorithm could be better, use ASMBitLastSetU32 next time. */
 #define MAKE_POWER_OF_TWO(a_MB) \
     while (!RT_IS_POWER_OF_TWO(a_MB)) \