From nobody Mon Feb 9 12:15:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+58860+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+58860+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588927134; cv=none; d=zohomail.com; s=zohoarc; b=WzvFrgFIz60Zv+eNizTMtop5VgfDDgLxTi0rwlb/QGqXcKeSTFFI1p8UxPYOYp2NDy55uUxzXB9IA+QVWvQe4o/5WbUiQIGt54ODVPgshy9yIzEYlcwJ6s4o3gMK/sxw65Au95xurbfwiFh/V4KTKz+eaaPGEgkal9snOzWmZmQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588927134; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=8rxeop4AT1u61VfyZtQezNbheU9poxDCZ/nb4ISOpzM=; b=HN168zirtbdfEBfiCS6oY9XYY50VGmVMfei1mw+ef1+iQaRrTPc96Btie3OCgQ69AOzrl4/iYrRzW/Sd3kr3B04QW+fCwMa9qXhbIi3Sj9vtppDA8kc72CDR6M9wjVJkRfyCrJG6u7AECG6Tnb7Sp8npjuNgULtCzL8W9/nDl28= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+58860+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1588927134548251.54668321544625; Fri, 8 May 2020 01:38:54 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id XvdeYY1788612xS5iD3G3GMi; Fri, 08 May 2020 01:38:54 -0700 X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web11.6710.1588927130864428592 for ; Fri, 08 May 2020 01:38:50 -0700 IronPort-SDR: GZR1Nff4151E9OOY5ccwZwePKsYGP6kJwCrW/i6yxNKQbFPTaRA4quvdn75+8XtdN7DkgdmPcZ Nd5ljdmy7Zdg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2020 01:38:49 -0700 IronPort-SDR: qMH/i5PnxGWONOgsaH8gaHY1bBb6g3Uatp/27pGc/+4YrAREC4lBzI6+DtRIKe8F+GT0vjivwV dXIVlJVUO6SA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="305366648" X-Received: from guominji-mobl.ccr.corp.intel.com ([10.238.4.95]) by FMSMGA003.fm.intel.com with ESMTP; 08 May 2020 01:38:47 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Zhichao Gao , Ray Ni Subject: [edk2-devel] [PATCH 14/18] MdeModulePkg/ConSplitterDxe: Remove All UGA Support. Date: Fri, 8 May 2020 16:38:20 +0800 Message-Id: <20200508083824.1785-15-guomin.jiang@intel.com> In-Reply-To: <20200508083824.1785-1-guomin.jiang@intel.com> References: <20200508083824.1785-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,guomin.jiang@intel.com X-Gm-Message-State: 1qbjf0gY8xfc953CQvFvPk41x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588927134; bh=IhF4/NhHB6gu7NTrzRRkkIluOsb+AvloLnl6GBcBIhc=; h=Cc:Date:From:Reply-To:Subject:To; b=RoPlHjYxfpGDMopwPn4JhA87IYhkLSYWcADzZIXJHyw5El2a8wsebf5URblAuZusRGM o39cxWkg6omBdh9i2LqOecLTEqQ7k8Nd5m/0Exg0rvbpCnzdgnj8h1HHY1CpItSKqecnv 5QSMZ+7PugpIXZJD/jEzL+XpzMUA7VGmebo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: GuoMinJ REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2368 Remove the PcdConOutGopSupport, it is unnecessary any more. Cc: Zhichao Gao Cc: Ray Ni Signed-off-by: Guomin Jiang --- .../Console/ConSplitterDxe/ConSplitter.c | 84 ++++++++----------- .../Console/ConSplitterDxe/ConSplitterDxe.inf | 9 +- .../Console/ConSplitterDxe/ConSplitterDxe.uni | 9 +- 3 files changed, 42 insertions(+), 60 deletions(-) diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/= MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c index 18c25956d0d9..350b85d73028 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c @@ -461,11 +461,6 @@ ConSplitterDriverEntry( ); ASSERT_EFI_ERROR (Status); =20 - // - // Graphics Output protocol must be supported. - // - ASSERT (FeaturePcdGet (PcdConOutGopSupport)); - // // The driver creates virtual handles for ConIn, ConOut, StdErr. // The virtual handles will always exist even if no console exist in the @@ -720,9 +715,7 @@ ConSplitterTextOutConstructor ( // // Copy protocols template // - if (FeaturePcdGet (PcdConOutGopSupport)) { - CopyMem (&ConOutPrivate->GraphicsOutput, &mGraphicsOutputProtocolTempl= ate, sizeof (EFI_GRAPHICS_OUTPUT_PROTOCOL)); - } + CopyMem (&ConOutPrivate->GraphicsOutput, &mGraphicsOutputProtocolTemplat= e, sizeof (EFI_GRAPHICS_OUTPUT_PROTOCOL)); =20 // // Initilize console output splitter's private data. @@ -764,47 +757,44 @@ ConSplitterTextOutConstructor ( ConOutPrivate->TextOutQueryData[0].Rows =3D 25; TextOutSetMode (ConOutPrivate, 0); =20 + // + // Setup resource for mode information in Graphics Output Protocol inter= face + // + if ((ConOutPrivate->GraphicsOutput.Mode =3D AllocateZeroPool (sizeof (EF= I_GRAPHICS_OUTPUT_PROTOCOL_MODE))) =3D=3D NULL) { + return EFI_OUT_OF_RESOURCES; + } + if ((ConOutPrivate->GraphicsOutput.Mode->Info =3D AllocateZeroPool (size= of (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION))) =3D=3D NULL) { + return EFI_OUT_OF_RESOURCES; + } + // + // Setup the DevNullGraphicsOutput to 800 x 600 x 32 bits per pixel + // DevNull will be updated to user-defined mode after driver has started. + // + if ((ConOutPrivate->GraphicsOutputModeBuffer =3D AllocateZeroPool (sizeo= f (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION))) =3D=3D NULL) { + return EFI_OUT_OF_RESOURCES; + } + Info =3D &ConOutPrivate->GraphicsOutputModeBuffer[0]; + Info->Version =3D 0; + Info->HorizontalResolution =3D 800; + Info->VerticalResolution =3D 600; + Info->PixelFormat =3D PixelBltOnly; + Info->PixelsPerScanLine =3D 800; + CopyMem (ConOutPrivate->GraphicsOutput.Mode->Info, Info, sizeof (EFI_GRA= PHICS_OUTPUT_MODE_INFORMATION)); + ConOutPrivate->GraphicsOutput.Mode->SizeOfInfo =3D sizeof (EFI_GRAPHICS_= OUTPUT_MODE_INFORMATION); =20 - if (FeaturePcdGet (PcdConOutGopSupport)) { - // - // Setup resource for mode information in Graphics Output Protocol int= erface - // - if ((ConOutPrivate->GraphicsOutput.Mode =3D AllocateZeroPool (sizeof (= EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE))) =3D=3D NULL) { - return EFI_OUT_OF_RESOURCES; - } - if ((ConOutPrivate->GraphicsOutput.Mode->Info =3D AllocateZeroPool (si= zeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION))) =3D=3D NULL) { - return EFI_OUT_OF_RESOURCES; - } - // - // Setup the DevNullGraphicsOutput to 800 x 600 x 32 bits per pixel - // DevNull will be updated to user-defined mode after driver has start= ed. - // - if ((ConOutPrivate->GraphicsOutputModeBuffer =3D AllocateZeroPool (siz= eof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION))) =3D=3D NULL) { - return EFI_OUT_OF_RESOURCES; - } - Info =3D &ConOutPrivate->GraphicsOutputModeBuffer[0]; - Info->Version =3D 0; - Info->HorizontalResolution =3D 800; - Info->VerticalResolution =3D 600; - Info->PixelFormat =3D PixelBltOnly; - Info->PixelsPerScanLine =3D 800; - CopyMem (ConOutPrivate->GraphicsOutput.Mode->Info, Info, sizeof (EFI_G= RAPHICS_OUTPUT_MODE_INFORMATION)); - ConOutPrivate->GraphicsOutput.Mode->SizeOfInfo =3D sizeof (EFI_GRAPHIC= S_OUTPUT_MODE_INFORMATION); - - // - // Initialize the following items, theset items remain unchanged in Gr= aphicsOutput->SetMode() - // GraphicsOutputMode->FrameBufferBase, GraphicsOutputMode->FrameBuffe= rSize - // - ConOutPrivate->GraphicsOutput.Mode->FrameBufferBase =3D (EFI_PHYSICAL_= ADDRESS) (UINTN) NULL; - ConOutPrivate->GraphicsOutput.Mode->FrameBufferSize =3D 0; + // + // Initialize the following items, theset items remain unchanged in Grap= hicsOutput->SetMode() + // GraphicsOutputMode->FrameBufferBase, GraphicsOutputMode->FrameBufferS= ize + // + ConOutPrivate->GraphicsOutput.Mode->FrameBufferBase =3D (EFI_PHYSICAL_AD= DRESS) (UINTN) NULL; + ConOutPrivate->GraphicsOutput.Mode->FrameBufferSize =3D 0; =20 - ConOutPrivate->GraphicsOutput.Mode->MaxMode =3D 1; - // - // Initial current mode to unknown state, and then set to mode 0 - // - ConOutPrivate->GraphicsOutput.Mode->Mode =3D 0xffff; - ConOutPrivate->GraphicsOutput.SetMode (&ConOutPrivate->GraphicsOutput,= 0); - } + ConOutPrivate->GraphicsOutput.Mode->MaxMode =3D 1; + // + // Initial current mode to unknown state, and then set to mode 0 + // + ConOutPrivate->GraphicsOutput.Mode->Mode =3D 0xffff; + ConOutPrivate->GraphicsOutput.SetMode (&ConOutPrivate->GraphicsOutput, 0= ); =20 return EFI_SUCCESS; } diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.i= nf b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf index 156757aee653..baa4051fd104 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf @@ -3,11 +3,9 @@ # # This driver acts as a virtual console, takes over the console I/O contro= l from selected # standard console devices, and transmits console I/O to related console d= evice drivers. -# Consplitter could install Graphics Output protocol in system -# table according PCD settings(PcdConOutGopSupport). It always -# consumes Graphics Output protocol which is produced by display device +# It always consumes Graphics Output protocol which is produced by display= device # -# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -90,9 +88,6 @@ [Protocols] ## SOMETIMES_CONSUMES gEfiGraphicsOutputProtocolGuid =20 -[FeaturePcd] - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport ## CONSUMES - [Pcd] ## SOMETIMES_PRODUCES ## SOMETIMES_CONSUMES diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.u= ni b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni index 903c505e303c..73b0010a57dd 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni @@ -3,11 +3,9 @@ // // This driver acts as a virtual console, takes over the console I/O contr= ol from selected // standard console devices, and transmits console I/O to related console = device drivers. -// Consplitter could install Graphics Output protocol in system -// table according PCD settings(PcdConOutGopSupport). It always -// consumes Graphics Output protocol which is produced by display device +// It always consumes Graphics Output protocol which is produced by displa= y device // -// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+// Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.
// // SPDX-License-Identifier: BSD-2-Clause-Patent // @@ -16,5 +14,4 @@ =20 #string STR_MODULE_ABSTRACT #language en-US "Provides multi co= nsole support" =20 -#string STR_MODULE_DESCRIPTION #language en-US "This driver acts = as a virtual console, takes over the console I/O control from selected stan= dard console devices, and transmits console I/O to related console device d= rivers. Consplitter could install Graphics Output protocol in system table = according PCD settings(PcdConOutGopSupport). It always consumes Graphics Ou= tput protocol, which is produced by display device." - +#string STR_MODULE_DESCRIPTION #language en-US "This driver acts = as a virtual console, takes over the console I/O control from selected stan= dard console devices, and transmits console I/O to related console device d= rivers. It always consumes Graphics Output protocol, which is produced by d= isplay device." --=20 2.25.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#58860): https://edk2.groups.io/g/devel/message/58860 Mute This Topic: https://groups.io/mt/74068793/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-