OvmfPkg/QemuVideoDxe: drop QEMU_VIDEO_BOCHS_MODES->ColorDepth

All video modes in the list are 32-bit,
so drop the useless ColorDepth field.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>

diff --git a/OvmfPkg/QemuVideoDxe/Initialize.c b/OvmfPkg/QemuVideoDxe/Initialize.c
index 8a70cf8484836d24aaaf5a9ec6542415a29d6b02..2b174d13faf2bb51d06d1af874746fde1e899265 100644 (file)
--- a/OvmfPkg/QemuVideoDxe/Initialize.c
+++ b/OvmfPkg/QemuVideoDxe/Initialize.c
@@ -203,43 +203,43 @@ QemuVideoCirrusModeSetup (
 /// Table of supported video modes\r
 ///\r
 STATIC QEMU_VIDEO_BOCHS_MODES  QemuVideoBochsModes[] = {\r
-  { 640,  480,  32 },\r
-  { 800,  480,  32 },\r
-  { 800,  600,  32 },\r
-  { 832,  624,  32 },\r
-  { 960,  640,  32 },\r
-  { 1024, 600,  32 },\r
-  { 1024, 768,  32 },\r
-  { 1152, 864,  32 },\r
-  { 1152, 870,  32 },\r
-  { 1280, 720,  32 },\r
-  { 1280, 760,  32 },\r
-  { 1280, 768,  32 },\r
-  { 1280, 800,  32 },\r
-  { 1280, 960,  32 },\r
-  { 1280, 1024, 32 },\r
-  { 1360, 768,  32 },\r
-  { 1366, 768,  32 },\r
-  { 1400, 1050, 32 },\r
-  { 1440, 900,  32 },\r
-  { 1600, 900,  32 },\r
-  { 1600, 1200, 32 },\r
-  { 1680, 1050, 32 },\r
-  { 1920, 1080, 32 },\r
-  { 1920, 1200, 32 },\r
-  { 1920, 1440, 32 },\r
-  { 2000, 2000, 32 },\r
-  { 2048, 1536, 32 },\r
-  { 2048, 2048, 32 },\r
-  { 2560, 1440, 32 },\r
-  { 2560, 1600, 32 },\r
-  { 2560, 2048, 32 },\r
-  { 2800, 2100, 32 },\r
-  { 3200, 2400, 32 },\r
-  { 3840, 2160, 32 },\r
-  { 4096, 2160, 32 },\r
-  { 7680, 4320, 32 },\r
-  { 8192, 4320, 32 }\r
+  { 640,  480  },\r
+  { 800,  480  },\r
+  { 800,  600  },\r
+  { 832,  624  },\r
+  { 960,  640  },\r
+  { 1024, 600  },\r
+  { 1024, 768  },\r
+  { 1152, 864  },\r
+  { 1152, 870  },\r
+  { 1280, 720  },\r
+  { 1280, 760  },\r
+  { 1280, 768  },\r
+  { 1280, 800  },\r
+  { 1280, 960  },\r
+  { 1280, 1024 },\r
+  { 1360, 768  },\r
+  { 1366, 768  },\r
+  { 1400, 1050 },\r
+  { 1440, 900  },\r
+  { 1600, 900  },\r
+  { 1600, 1200 },\r
+  { 1680, 1050 },\r
+  { 1920, 1080 },\r
+  { 1920, 1200 },\r
+  { 1920, 1440 },\r
+  { 2000, 2000 },\r
+  { 2048, 1536 },\r
+  { 2048, 2048 },\r
+  { 2560, 1440 },\r
+  { 2560, 1600 },\r
+  { 2560, 2048 },\r
+  { 2800, 2100 },\r
+  { 3200, 2400 },\r
+  { 3840, 2160 },\r
+  { 4096, 2160 },\r
+  { 7680, 4320 },\r
+  { 8192, 4320 }\r
 };\r
 \r
 #define QEMU_VIDEO_BOCHS_MODE_COUNT \\r
@@ -348,14 +348,12 @@ QemuVideoBochsModeSetup (
   for (Index = 0; Index < QEMU_VIDEO_BOCHS_MODE_COUNT; Index++) {\r
     UINTN  RequiredFbSize;\r
 \r
-    ASSERT (VideoMode->ColorDepth % 8 == 0);\r
-    RequiredFbSize = (UINTN)VideoMode->Width * VideoMode->Height *\r
-                     (VideoMode->ColorDepth / 8);\r
+    RequiredFbSize = (UINTN)VideoMode->Width * VideoMode->Height * 4;\r
     if (RequiredFbSize <= AvailableFbSize) {\r
       ModeData->InternalModeIndex    = Index;\r
       ModeData->HorizontalResolution = VideoMode->Width;\r
       ModeData->VerticalResolution   = VideoMode->Height;\r
-      ModeData->ColorDepth           = VideoMode->ColorDepth;\r
+      ModeData->ColorDepth           = 32;\r
       DEBUG ((\r
         DEBUG_INFO,\r
         "Adding Mode %d as Bochs Internal Mode %d: %dx%d, %d-bit\n",\r

diff --git a/OvmfPkg/QemuVideoDxe/Qemu.h b/OvmfPkg/QemuVideoDxe/Qemu.h
index fef648c967b2026f85d239ae51ccaf95a2f73259..1e6507f44caaff600f55d195234972d3572a8c40 100644 (file)
--- a/OvmfPkg/QemuVideoDxe/Qemu.h
+++ b/OvmfPkg/QemuVideoDxe/Qemu.h
@@ -132,7 +132,6 @@ typedef struct {
 typedef struct {\r
   UINT32    Width;\r
   UINT32    Height;\r
-  UINT32    ColorDepth;\r
 } QEMU_VIDEO_BOCHS_MODES;\r
 \r
 #define QEMU_VIDEO_PRIVATE_DATA_FROM_GRAPHICS_OUTPUT_THIS(a) \\r