OvmfPkg/QemuFlashFvbServicesRuntimeDxe: Do not expose MMIO in SMM build

[mirror_edk2.git] / OvmfPkg / QemuVideoDxe / Gop.c

diff --git a/OvmfPkg/QemuVideoDxe/Gop.c b/OvmfPkg/QemuVideoDxe/Gop.c
index b479d24a87634a31c4d563dd542fa3ef637c7c8a..c9941ef138bd01caf819af8566cc221445218282 100644 (file)
--- a/OvmfPkg/QemuVideoDxe/Gop.c
+++ b/OvmfPkg/QemuVideoDxe/Gop.c
@@ -69,6 +69,9 @@ QemuVideoCompleteModeData (
   Mode->FrameBufferBase = FrameBufDesc->AddrRangeMin;\r
   Mode->FrameBufferSize = Info->HorizontalResolution * Info->VerticalResolution;\r
   Mode->FrameBufferSize = Mode->FrameBufferSize * ((ModeData->ColorDepth + 7) / 8);\r
+  Mode->FrameBufferSize = EFI_PAGES_TO_SIZE (\r
+                            EFI_SIZE_TO_PAGES (Mode->FrameBufferSize)\r
+                            );\r
   DEBUG ((EFI_D_INFO, "FrameBufferBase: 0x%Lx, FrameBufferSize: 0x%Lx\n",\r
     Mode->FrameBufferBase, (UINT64)Mode->FrameBufferSize));\r
 \r
@@ -107,6 +110,9 @@ QemuVideoVmwareSvgaCompleteModeData (
 \r
   Mode->FrameBufferBase = FrameBufDesc->AddrRangeMin + FbOffset;\r
   Mode->FrameBufferSize = BytesPerLine * Info->VerticalResolution;\r
+  Mode->FrameBufferSize = EFI_PAGES_TO_SIZE (\r
+                            EFI_SIZE_TO_PAGES (Mode->FrameBufferSize)\r
+                            );\r
 \r
   FreePool (FrameBufDesc);\r
   return Status;\r
@@ -366,7 +372,7 @@ Returns:
 \r
   default:\r
     Status = EFI_INVALID_PARAMETER;\r
-    ASSERT (FALSE);\r
+    break;\r
   }\r
 \r
   gBS->RestoreTPL (OriginalTPL);\r