UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / MdeModulePkg / Universal / Console / GraphicsConsoleDxe / GraphicsConsole.c

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
index 8f0cba9fcde961eb1892db4197f084ab0dcec4c3..b895dafedeaab9516df3fae3f50a21d27ce003c6 100644 (file)
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
@@ -1,7 +1,7 @@
 /** @file\r
   This is the main routine for initializing the Graphics Console support routines.\r
 \r
-Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
 SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -40,7 +40,10 @@ GRAPHICS_CONSOLE_DEV  mGraphicsConsoleDevTemplate = {
 };\r
 \r
 GRAPHICS_CONSOLE_MODE_DATA  mGraphicsConsoleModeData[] = {\r
-  { 100, 31 },\r
+  { 100, 31 },  //  800 x 600\r
+  { 128, 40 },  // 1024 x 768\r
+  { 160, 42 },  // 1280 x 800\r
+  { 240, 56 },  // 1920 x 1080\r
   //\r
   // New modes can be added here.\r
   // The last entry is specific for full screen mode.\r
@@ -518,7 +521,7 @@ GraphicsConsoleControllerDriverStart (
       }\r
     }\r
 \r
-    if (ModeNumber != Private->GraphicsOutput->Mode->Mode) {\r
+    if (EFI_ERROR (Status) || (ModeNumber != Private->GraphicsOutput->Mode->Mode)) {\r
       //\r
       // Current graphics mode is not set or is not set to the mode which we have found,\r
       // set the new graphic mode.\r