From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: zhichao.gao@intel.com) Received: from mga14.intel.com (mga14.intel.com []) by groups.io with SMTP; Tue, 23 Apr 2019 00:04:58 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Apr 2019 00:04:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,384,1549958400"; d="scan'208";a="145043941" Received: from fieedk001.ccr.corp.intel.com ([10.239.33.119]) by fmsmga007.fm.intel.com with ESMTP; 23 Apr 2019 00:04:56 -0700 From: "Gao, Zhichao" To: devel@edk2.groups.io Cc: Aaron Antone , Jian J Wang , Hao Wu , Ray Ni , Star Zeng , Liming Gao , Sean Brogan , Michael Turner , Bret Barkelew , Laszlo Ersek Subject: [PATCH V2 2/2] MdeModulePkg/GraphicsConsoleDxe: Do not clean the screen Date: Tue, 23 Apr 2019 15:04:50 +0800 Message-Id: <20190423070450.1892-3-zhichao.gao@intel.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190423070450.1892-1-zhichao.gao@intel.com> References: <20190423070450.1892-1-zhichao.gao@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Aaron Antone REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1412 For now, most platform support to display during PEIM. It means the logo can show at PEI phase. But the screen would be cleared at BDS connect console phase. That may make the screen flush and turn into black screen. So do not clear the screen while set the text mode for graphics console device for the first time boot. As the shell reconnect command would make the same reslut with the first boot, use the gEfiEventReadyToBootGuid to distinguish them. Also replace the debug code in GraphicsConsoleControllerDriverStart. The origin one would set a basic mode and then print the text info to graphic console device. Then the conspliter would set a best mode for graphics console device. If the best mode is different with the basic one, the screen would be cleared. So use the debug output instead. This patch only affect the behavior of SetMode at the first boot during the graphics console devices first connect operations. That means at DXE phase before ReadyToBoot, the Graphics Simple Text Out SetMode would not clear the screen during the first connecttion of the graphics devices. Cc: Jian J Wang Cc: Hao Wu Cc: Ray Ni Cc: Star Zeng Cc: Liming Gao Cc: Sean Brogan Cc: Michael Turner Cc: Bret Barkelew Cc: Laszlo Ersek Signed-off-by: Zhichao Gao --- .../GraphicsConsoleDxe/GraphicsConsole.c | 82 +++++++++++++------ .../GraphicsConsoleDxe/GraphicsConsoleDxe.inf | 3 + 2 files changed, 62 insertions(+), 23 deletions(-) diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c index 26ea19f300..39a999838c 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c @@ -1,7 +1,7 @@ /** @file This is the main routine for initializing the Graphics Console support routines. -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -96,6 +96,12 @@ EFI_DRIVER_BINDING_PROTOCOL gGraphicsConsoleDriverBinding = { NULL }; +// +// Event and variable to indicate the boot phase. +// +EFI_EVENT mGraphicsConsoleReadyToBootEvent; +BOOLEAN mGraphicsConsoleReadyToBoot = FALSE; + /** Test to see if Graphics Console could be supported on the Controller. @@ -567,16 +573,7 @@ GraphicsConsoleControllerDriverStart ( // Private->SimpleTextOutputMode.MaxMode = (INT32) MaxMode; - DEBUG_CODE_BEGIN (); - Status = GraphicsConsoleConOutSetMode (&Private->SimpleTextOutput, 0); - if (EFI_ERROR (Status)) { - goto Error; - } - Status = GraphicsConsoleConOutOutputString (&Private->SimpleTextOutput, (CHAR16 *)L"Graphics Console Started\n\r"); - if (EFI_ERROR (Status)) { - goto Error; - } - DEBUG_CODE_END (); + DEBUG ((DEBUG_INFO, "Graphics Console Started!\n\r")); // // Install protocol interfaces for the Graphics Console device. @@ -1366,18 +1363,26 @@ GraphicsConsoleConOutSetMode ( // // The current graphics mode is correct, so simply clear the entire display // - Status = GraphicsOutput->Blt ( - GraphicsOutput, - &mGraphicsEfiColors[0], - EfiBltVideoFill, - 0, - 0, - 0, - 0, - ModeData->GopWidth, - ModeData->GopHeight, - 0 - ); + // + // For the first time boot system, do not clear the display. + // Some platforms would show logo at PEIM and this would clear + // the whole screen. So for first boot set mode, do not clear + // the screen. + // + if (This->Mode->Mode != -1 || mGraphicsConsoleReadyToBoot) { + Status = GraphicsOutput->Blt ( + GraphicsOutput, + &mGraphicsEfiColors[0], + EfiBltVideoFill, + 0, + 0, + 0, + 0, + ModeData->GopWidth, + ModeData->GopHeight, + 0 + ); + } } } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { // @@ -2065,6 +2070,24 @@ RegisterFontPackage ( FreePool (Package); } +/** + Indicate the Boot phase is at ReadyToBoot. + + @param[in] Event The Event that is being processed. + @param[in] Context The Event Context. + +**/ +VOID +GraphicsConsoleReadyToBootEvent ( + IN EFI_EVENT Event, + IN VOID *Context + ) +{ + mGraphicsConsoleReadyToBoot = TRUE; + + gBS->CloseEvent (mGraphicsConsoleReadyToBootEvent); +} + /** The user Entry Point for module GraphicsConsole. The user code starts with this function. @@ -2095,6 +2118,19 @@ InitializeGraphicsConsole ( &mHiiRegistration ); + // + // Create a event function of ReadyToBoot to avoid clearing screen before boot + // + Status = gBS->CreateEventEx ( + EVT_NOTIFY_SIGNAL, + TPL_NOTIFY, + GraphicsConsoleReadyToBootEvent, + NULL, + &gEfiEventReadyToBootGuid, + &mGraphicsConsoleReadyToBootEvent + ); + ASSERT_EFI_ERROR (Status); + // // Install driver model protocol(s). // diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf index f7caa65aa9..59751893f6 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf @@ -49,6 +49,9 @@ HiiLib PcdLib +[Guids] + gEfiEventReadyToBootGuid ## CONSUMES + [Protocols] gEfiDevicePathProtocolGuid ## TO_START gEfiSimpleTextOutProtocolGuid ## BY_START -- 2.21.0.windows.1