From nobody Sun May 5 01:01:08 2024 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+58847+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+58847+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588927109; cv=none; d=zohomail.com; s=zohoarc; b=XqmpOheWpY96I389adDM416B1ARcJaxBbTqkCTzq59qU9Uwa0zrrrVCWDblMBMQckGi7TGsTQ2dDqRA823SNUBtF8JUZcZm2V+9zHzxLxkl8z3quP9I37LE1QD0eq+SznF5ukAWbN08aKEwqOIzqisi9N6eEr5tLAEK+f10aiRI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588927109; 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=/MU58PbsItqOH4SLFVAKC80RavqFuLmzEmKHifFk6aA=; b=Gj0DvlhVa0ilmo/wny2LuejHKhDR2wYbLAnvhnZsBLSnJXglDhKF3h/hiCE9qi/evTSReOQS/USSVepA6LO+6I1gN0QfbQvZ3u5S534mf31oZ1auF+MfYSow6vrEV1ZjHlDx7/CEMBQc+/KTj4e6yaYqE6q/owxlm/vureAmsjw= 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+58847+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 1588927109263107.28362670370643; Fri, 8 May 2020 01:38:29 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id pFhDYY1788612x6CMOWWHhy1; Fri, 08 May 2020 01:38:28 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web11.6706.1588927106995409598 for ; Fri, 08 May 2020 01:38:28 -0700 IronPort-SDR: sXmLDrh9dL7sDYox6IqApUV4AMMHn7JBi12Kie4zTCOsmJQ3ZCvH2DChsOhBOzjJjc2AAJWxd7 8k6x3Lxm5BDQ== 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:28 -0700 IronPort-SDR: vxk08/2erjahQZ9KijS4zDem7DBwDp9rvF9pts0v1bU3VAuOe2UIYYvyakCs1QkR2/W0iwhvL8 mYwQJ5I3oLIQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="305366548" 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:26 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Bob Feng , Liming Gao Subject: [edk2-devel] [PATCH 01/18] BaseTools: Remove All UGA Support Date: Fri, 8 May 2020 16:38:07 +0800 Message-Id: <20200508083824.1785-2-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: LLSLbE6M8lUvvRxguQQIcFIQx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588927108; bh=XA3wfKBECfzx4F/ceK7vmJCIsimJN6PVGe6GmGD1XQc=; h=Cc:Date:From:Reply-To:Subject:To; b=rOEs4kYVyqE/fObUqqneKkpWnsR2DzlB6Y1IyefraRf3zTN5IPtyswGxIWgSneqMyuk 8LwiUGJqbfdZVGaivepulhmCQ7McwJyXi2u3CVEXNdK28OylEjIV5NpYNTyK1BHP3GkrK u4eRSpvUB3mJK21MUAET712HSrC2JxmMjO0= 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 all UGA support in BaseTools package. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Guomin Jiang --- .../Source/C/Include/Protocol/HiiFramework.h | 51 ------ BaseTools/Source/C/Include/Protocol/UgaDraw.h | 161 ------------------ 2 files changed, 212 deletions(-) delete mode 100644 BaseTools/Source/C/Include/Protocol/UgaDraw.h diff --git a/BaseTools/Source/C/Include/Protocol/HiiFramework.h b/BaseTools= /Source/C/Include/Protocol/HiiFramework.h index 448350967bbf..09cbf23640c1 100644 --- a/BaseTools/Source/C/Include/Protocol/HiiFramework.h +++ b/BaseTools/Source/C/Include/Protocol/HiiFramework.h @@ -28,20 +28,6 @@ 0xd7ad636e, 0xb997, 0x459b, {0xbf, 0x3f, 0x88, 0x46, 0x89, 0x79, 0x80,= 0xe1} \ } =20 -// BugBug: -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= ++++ -// If UGA goes away we need to put this some place. I'm not sure where? -// -//typedef struct { -// UINT8 Blue; -// UINT8 Green; -// UINT8 Red; -// UINT8 Reserved; -//} EFI_UGA_PIXEL; - -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= ++++ -// - typedef struct _EFI_HII_PROTOCOL EFI_HII_PROTOCOL; =20 // @@ -575,39 +561,6 @@ EFI_STATUS IN OUT UINT32 *InternalStatus ); =20 -/** - Translates a glyph into the format required for input to the Universal - Graphics Adapter (UGA) Block Transfer (BLT) routines. - - @param This A pointer to the EFI_HII_PROTOCOL instance. - @param GlyphBuffer A pointer to the buffer that contains glyp= h data. - @param Foreground The foreground setting requested to be use= d for the - generated BltBuffer data. - @param Background The background setting requested to be use= d for the - generated BltBuffer data. - @param Count The entry in the BltBuffer upon which to a= ct. - @param Width The width in bits of the glyph being conve= rted. - @param Height The height in bits of the glyph being conv= erted - @param BltBuffer A pointer to the buffer that contains the = data that is - ready to be used by the UGA BLT routines. - - @retval EFI_SUCCESS It worked. - @retval EFI_NOT_FOUND A glyph for a character was not found. - -**/ -typedef -EFI_STATUS -(EFIAPI *EFI_HII_GLYPH_TO_BLT) ( - IN EFI_HII_PROTOCOL *This, - IN UINT8 *GlyphBuffer, - IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL Foreground, - IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL Background, - IN UINTN Count, - IN UINTN Width, - IN UINTN Height, - IN OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer - ); - /** Allows a new string to be added to an already existing string package. =20 @@ -878,9 +831,6 @@ EFI_STATUS @param GetGlyph Translates a Unicode character into the corresponding font glyph. =20 - @param GlyphToBlt - Converts a glyph value into a format that is ready for a UGA BLT command. - @param NewString Allows a new string to be added to an already existing string package. =20 @@ -924,7 +874,6 @@ struct _EFI_HII_PROTOCOL { =20 EFI_HII_TEST_STRING TestString; EFI_HII_GET_GLYPH GetGlyph; - EFI_HII_GLYPH_TO_BLT GlyphToBlt; =20 EFI_HII_NEW_STRING NewString; EFI_HII_GET_PRI_LANGUAGES GetPrimaryLanguages; diff --git a/BaseTools/Source/C/Include/Protocol/UgaDraw.h b/BaseTools/Sour= ce/C/Include/Protocol/UgaDraw.h deleted file mode 100644 index 412b000aeb6b..000000000000 --- a/BaseTools/Source/C/Include/Protocol/UgaDraw.h +++ /dev/null @@ -1,161 +0,0 @@ -/** @file - UGA Draw protocol from the EFI 1.1 specification. - - Abstraction of a very simple graphics device. - - Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
- - SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#ifndef __UGA_DRAW_H__ -#define __UGA_DRAW_H__ - -#define EFI_UGA_DRAW_PROTOCOL_GUID \ - { \ - 0x982c298b, 0xf4fa, 0x41cb, {0xb8, 0x38, 0x77, 0xaa, 0x68, 0x8f, 0xb8,= 0x39 } \ - } - -typedef struct _EFI_UGA_DRAW_PROTOCOL EFI_UGA_DRAW_PROTOCOL; - -/** - Return the current video mode information. - - @param This Protocol instance pointer. - @param HorizontalResolution Current video horizontal resolution in pix= els - @param VerticalResolution Current video vertical resolution in pixels - @param ColorDepth Current video color depth in bits per pixel - @param RefreshRate Current video refresh rate in Hz. - - @retval EFI_SUCCESS Mode information returned. - @retval EFI_NOT_STARTED Video display is not initialized. Call Set= Mode () - @retval EFI_INVALID_PARAMETER One of the input args was NULL. - -**/ -typedef -EFI_STATUS -(EFIAPI *EFI_UGA_DRAW_PROTOCOL_GET_MODE) ( - IN EFI_UGA_DRAW_PROTOCOL *This, - OUT UINT32 *HorizontalResolution, - OUT UINT32 *VerticalResolution, - OUT UINT32 *ColorDepth, - OUT UINT32 *RefreshRate - ) -; - -/** - Return the current video mode information. - - @param This Protocol instance pointer. - @param HorizontalResolution Current video horizontal resolution in pixe= ls - @param VerticalResolution Current video vertical resolution in pixels - @param ColorDepth Current video color depth in bits per pixel - @param RefreshRate Current video refresh rate in Hz. - - @retval EFI_SUCCESS Mode information returned. - @retval EFI_NOT_STARTED Video display is not initialized. Call SetM= ode () - -**/ -typedef -EFI_STATUS -(EFIAPI *EFI_UGA_DRAW_PROTOCOL_SET_MODE) ( - IN EFI_UGA_DRAW_PROTOCOL *This, - IN UINT32 HorizontalResolution, - IN UINT32 VerticalResolution, - IN UINT32 ColorDepth, - IN UINT32 RefreshRate - ) -; - -typedef struct { - UINT8 Blue; - UINT8 Green; - UINT8 Red; - UINT8 Reserved; -} EFI_UGA_PIXEL; - -typedef union { - EFI_UGA_PIXEL Pixel; - UINT32 Raw; -} EFI_UGA_PIXEL_UNION; - -typedef enum { - EfiUgaVideoFill, - EfiUgaVideoToBltBuffer, - EfiUgaBltBufferToVideo, - EfiUgaVideoToVideo, - EfiUgaBltMax -} EFI_UGA_BLT_OPERATION; - -/** - Type specifying a pointer to a function to perform an UGA Blt operation. - - The following table defines actions for BltOperations: - - EfiUgaVideoFill - Write data from the BltBuffer pixel (SourceX= , SourceY) - directly to every pixel of the video display rectangle - (DestinationX, DestinationY) (DestinationX + Width, DestinationY + H= eight). - Only one pixel will be used from the BltBuffer. Delta is NOT used. - - EfiUgaVideoToBltBuffer - Read data from the video display recta= ngle - (SourceX, SourceY) (SourceX + Width, SourceY + Height) and place it = in - the BltBuffer rectangle (DestinationX, DestinationY ) - (DestinationX + Width, DestinationY + Height). If DestinationX or - DestinationY is not zero then Delta must be set to the length in byt= es - of a row in the BltBuffer. - - EfiUgaBltBufferToVideo - Write data from the BltBuffer rectang= le - (SourceX, SourceY) (SourceX + Width, SourceY + Height) directly to t= he - video display rectangle (DestinationX, DestinationY) - (DestinationX + Width, DestinationY + Height). If SourceX or SourceY= is - not zero then Delta must be set to the length in bytes of a row in t= he - BltBuffer. - - EfiUgaVideoToVideo - Copy from the video display rectangle (Sou= rceX, SourceY) - (SourceX + Width, SourceY + Height) .to the video display rectangle - (DestinationX, DestinationY) (DestinationX + Width, DestinationY + He= ight). - The BltBuffer and Delta are not used in this mode. - - - @param[in] This - Protocol instance pointer. - @param[in] BltBuffer - Buffer containing data to blit into video b= uffer. This - buffer has a size of Width*Height*sizeof(EF= I_UGA_PIXEL) - @param[in] BltOperation - Operation to perform on BlitBuffer and vide= o memory - @param[in] SourceX - X coordinate of source for the BltBuffer. - @param[in] SourceY - Y coordinate of source for the BltBuffer. - @param[in] DestinationX - X coordinate of destination for the BltBuff= er. - @param[in] DestinationY - Y coordinate of destination for the BltBuff= er. - @param[in] Width - Width of rectangle in BltBuffer in pixels. - @param[in] Height - Height of rectangle in BltBuffer in pixels. - @param[in] Delta - OPTIONAL - - @retval EFI_SUCCESS - The Blt operation completed. - @retval EFI_INVALID_PARAMETER - BltOperation is not valid. - @retval EFI_DEVICE_ERROR - A hardware error occurred writing to t= he video buffer. - ---*/ -typedef -EFI_STATUS -(EFIAPI *EFI_UGA_DRAW_PROTOCOL_BLT) ( - IN EFI_UGA_DRAW_PROTOCOL * This, - IN EFI_UGA_PIXEL * BltBuffer, OPTIONAL - IN EFI_UGA_BLT_OPERATION BltOperation, - IN UINTN SourceX, - IN UINTN SourceY, - IN UINTN DestinationX, - IN UINTN DestinationY, - IN UINTN Width, - IN UINTN Height, - IN UINTN Delta OPTIONAL - ); - -struct _EFI_UGA_DRAW_PROTOCOL { - EFI_UGA_DRAW_PROTOCOL_GET_MODE GetMode; - EFI_UGA_DRAW_PROTOCOL_SET_MODE SetMode; - EFI_UGA_DRAW_PROTOCOL_BLT Blt; -}; - -extern EFI_GUID gEfiUgaDrawProtocolGuid; - -#endif --=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 (#58847): https://edk2.groups.io/g/devel/message/58847 Mute This Topic: https://groups.io/mt/74068777/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- From nobody Sun May 5 01:01:08 2024 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+58848+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+58848+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588927127; cv=none; d=zohomail.com; s=zohoarc; b=My0kR2c+J2ucRyYwernD166yETwuWbPAE1e3Xlp5FZIDWk2ubHb6lxqHkkktIaVnR6C/wOKGoMbpk6RpUIEfptJEt4T7ITKzRUBD+gDjaQwYnnREKS2BBAj0Vb2uzdBIvZFooVsqOtLA+o4pu6pV/GFjyJbcTgogjSXvd1vee1k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588927127; 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=9y2ct33GHdDs4s5mDjt36o21TP+W/rH0BfXO6fYXgxM=; b=JpEIpVOsQgkEISHd5MHDUacWjvQ6dmrtwiXF16hOn2fN6rajV83eVE1Mf7qGDVS7doiRGHiIFeodUWCXp9X+DEhWGQWHRFTLXFJdLOTOjpNOTkEz6yaIguPoDcglRvTWEJgkO2isfUWAfrQ9DaoXMf2GRPlx0h18HPYVNkZmk9c= 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+58848+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 1588927127457636.5253541308454; Fri, 8 May 2020 01:38:47 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id VFCxYY1788612xJKKOZkll9z; Fri, 08 May 2020 01:38:47 -0700 X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.6878.1588927126653624329 for ; Fri, 08 May 2020 01:38:46 -0700 IronPort-SDR: XYhgnvRICuhjD2eNIYREajQEhPQ4Tf/xhwr08xl6Z6CCYvn5w20qQaMiL3HdkkLKHvHM/W60R7 PCb+qbZy9rQw== 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:29 -0700 IronPort-SDR: pHZLo2s/WGcAPGDWqaPd5ZhgITUKDMxfF4iTDnqGab9eiqkHzUUOYvzfLRaMD99qynI48FJ0J1 IBvBH8DLSTIA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="305366552" 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:28 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Maurice Ma , Guo Dong , Benjamin You Subject: [edk2-devel] [PATCH 02/18] UefiPayloadPkg: Remove All UGA Support Date: Fri, 8 May 2020 16:38:08 +0800 Message-Id: <20200508083824.1785-3-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: zdSPTRpuvkMQiwJ9RpzLtr1jx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588927127; bh=HmY9kXdBErFc52Lh9tgWZ+BUJL/3KldQSIpSN5yAg0s=; h=Cc:Date:From:Reply-To:Subject:To; b=lVYrEZaZ3EdTBpqZ7EVefgEJdMjb2rn47341nZ3icu19xM5Q3BCg7xXPnsiicH8F6Fs vzpo0e2y8bzhH5NwPU1SLsKzuRY+xtb7HqJOPQ81pkG80QUNQP1ruG/sNNGGmGA/9pOqq APSOH+MPAtjZLq1kv86+6UF70mD98F9YLlw= 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 All UGA Support in UefiPayloadPkg. Cc: Maurice Ma Cc: Guo Dong Cc: Benjamin You Signed-off-by: Guomin Jiang Reviewed-by: Maurice Ma --- .../Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 2 -- UefiPayloadPkg/UefiPayloadPkgIa32.dsc | 1 - UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc | 1 - 3 files changed, 4 deletions(-) diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootMana= gerLib.inf b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootMana= gerLib.inf index 1f5a0bcad038..1072a3b21011 100644 --- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.= inf +++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.= inf @@ -53,14 +53,12 @@ [Guids] [Protocols] gEfiGenericMemTestProtocolGuid ## CONSUMES gEfiGraphicsOutputProtocolGuid ## CONSUMES - gEfiUgaDrawProtocolGuid ## CONSUMES gEfiBootLogoProtocolGuid ## CONSUMES gEfiDxeSmmReadyToLockProtocolGuid gEfiSmmAccess2ProtocolGuid =20 [Pcd] gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut - gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc b/UefiPayloadPkg/UefiPay= loadPkgIa32.dsc index d52945442e0e..e8832925eed8 100644 --- a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc +++ b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc @@ -272,7 +272,6 @@ [PcdsFeatureFlag] gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE =20 [PcdsFixedAtBuild] gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x10000 diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc b/UefiPayloadPkg/Uefi= PayloadPkgIa32X64.dsc index 0736cd995476..20462f68817d 100644 --- a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc +++ b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc @@ -273,7 +273,6 @@ [PcdsFeatureFlag] gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE =20 [PcdsFixedAtBuild] gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x10000 --=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 (#58848): https://edk2.groups.io/g/devel/message/58848 Mute This Topic: https://groups.io/mt/74068779/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- From nobody Sun May 5 01:01:08 2024 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+58849+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+58849+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588927128; cv=none; d=zohomail.com; s=zohoarc; b=Gi56re596AO4SZPD4xi1c7/yiCkWhVWFkB++xYyg2uvdnFLR/Qn4rE+LIAfa702O0EoWuD0fNFL51hBJ4bctt/plsfLr4HQqXPymYaYPk+5ES2Dny6DDa0NKiJoNT+Dv3S2rJJbm+lOA1mJ9iekg5+Oiz70UE2fCF8fMTkL60uU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588927128; 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=JYwmmPcbjNdnteYcMVUZ1o7nCTlWtq+FN/JnjkawWDI=; b=fVZpxW7TIg4GnT9JAqEM4UjtcVPKUqc/0kwy1JLs6QIfxSUTuIN5rHkvxEJISLLZbNr7EtaqwF5jXFqaRsUjIY6uizDYQC2MM3P6yA4D1YqVZjjg/XDA1rIA8HI6jr5oy+hp5SefoiNLqTujhs2Yv1HvKeH/oxHT/a+B8U7wO7c= 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+58849+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 1588927128679977.3139975037874; Fri, 8 May 2020 01:38:48 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id TPkhYY1788612xV3Pdyo1unw; Fri, 08 May 2020 01:38:48 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web12.6878.1588927126653624329 for ; Fri, 08 May 2020 01:38:47 -0700 IronPort-SDR: sJRZ3fciumugx8VAfB01BuNdBeCUveZ6l9iMuGrlT926iC13im3veDqQmgZnIvMPOif71cmXzc gIXDWzhL2QpQ== 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:31 -0700 IronPort-SDR: K6c/hPiretO4JMKT1nJebS4HtmTKJKAfJJ/a6qs3Rk7wSCqA4Bk6ucgL0uXnYe2D492MFd9ctd o9AuDdnVsOPg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="305366561" 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:29 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Ray Ni , Zhichao Gao Subject: [edk2-devel] [PATCH 03/18] ShellPkg: Remove All UGA Support Date: Fri, 8 May 2020 16:38:09 +0800 Message-Id: <20200508083824.1785-4-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: P6v9LceZoJJBr1dxqorvzYM3x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588927128; bh=PYpFEs87o8Ye2P0qFIRHKJ+F+n5cbYhSztwdvvv21DU=; h=Cc:Date:From:Reply-To:Subject:To; b=PhIn7vF7I5IiN7mM0fZzTHx2sQh8baWbuad8t0TTglfymrONKZC7uyXlEGKkFVMg/LL racQDBgLUi38HGzmHL1v8d3tiUSeDzPWDeR+WQ/+eVsrTNUbDS6ISL127VwgEG132WdcW TbVe+AW5APB5ubsFfw2kmLZ1FEEZTIXHUfA= 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 All UGA Support in ShellPkg. Cc: Ray Ni Cc: Zhichao Gao Signed-off-by: Guomin Jiang --- ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c | 2 -- ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h | 2 -- ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf | 2 -- ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni | 2 -- 4 files changed, 8 deletions(-) diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b= /ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c index 500a95a89a8f..53f83e419976 100644 --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c @@ -2148,8 +2148,6 @@ STATIC CONST GUID_INFO_BLOCK mGuidStringList[] =3D { {STRING_TOKEN(STR_SHELL_ENV2), &gEfiShellEnvironment2Guid, = NULL}, {STRING_TOKEN(STR_SHELL_ENV), &gEfiShellEnvironment2Guid, = NULL}, {STRING_TOKEN(STR_DEVICE_IO), &gEfiDeviceIoProtocolGuid, = NULL}, - {STRING_TOKEN(STR_UGA_DRAW), &gEfiUgaDrawProtocolGuid, = NULL}, - {STRING_TOKEN(STR_UGA_IO), &gEfiUgaIoProtocolGuid, = NULL}, {STRING_TOKEN(STR_ESP), &gEfiPartTypeSystemPartGuid, = NULL}, {STRING_TOKEN(STR_GPT_NBR), &gEfiPartTypeLegacyMbrGuid, = NULL}, {STRING_TOKEN(STR_DRIVER_CONFIG), &gEfiDriverConfigurationProtoc= olGuid, NULL}, diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h b= /ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h index d91857b8b035..72e2774a935f 100644 --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h @@ -94,8 +94,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf= b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf index 93b69cd8e983..7a94e5638b4c 100644 --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf @@ -129,8 +129,6 @@ [Protocols] gEfiHiiConfigAccessProtocolGuid ## UNDEFINED gEfiFormBrowser2ProtocolGuid ## UNDEFINED gEfiDeviceIoProtocolGuid ## UNDEFINED - gEfiUgaDrawProtocolGuid ## UNDEFINED - gEfiUgaIoProtocolGuid ## UNDEFINED gEfiDriverConfigurationProtocolGuid ## UNDEFINED gEfiDriverConfiguration2ProtocolGuid ## UNDEFINED gEfiSimpleTextInputExProtocolGuid ## UNDEFINED diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni= b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni index 9c8028d0d5c0..4536da4e7a1f 100644 --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni @@ -161,8 +161,6 @@ #string STR_SHELL_ALIAS #language en-US "ShellAlias" #string STR_DEVICE_IO #language en-US "DeviceIO" #string STR_TCP #language en-US "TCP" -#string STR_UGA_DRAW #language en-US "UGADraw" -#string STR_UGA_IO #language en-US "UGAIO" #string STR_ESP #language en-US "EFISystemPartition" #string STR_GPT_NBR #language en-US "LegacyMBR" #string STR_DRIVER_CONFIG #language en-US "DriverConfiguration" --=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 (#58849): https://edk2.groups.io/g/devel/message/58849 Mute This Topic: https://groups.io/mt/74068781/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- From nobody Sun May 5 01:01:08 2024 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+58850+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+58850+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588927130; cv=none; d=zohomail.com; s=zohoarc; b=ZNelcw673oyjMORVLmWq2M3P/MB6MWkjFRrQpkCqBwZdUORt1gymgdpqlDlL1h6LO3gyJ9D78qZ+7uodiNGBDSpMlaOJ8AvhcGBERsJE35HDzB75uxW2sotEC/8Q3582Ie1DsebbXjXESs10jOgVvW00c9aDJvRBgXHG/GmTAfA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588927130; 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=oR/bJONs+88fyS8GuoPsscEx93ugOuRmjGF3P0/ahoY=; b=Sx9Ej5G16Qd/R/nE1WsPaeEpH0Rq+VX+DiUA7dNU3wHG3nTxKabEFK3FIfnqsbKt13Eafx4m9oDXdFJM0BYmzo8VuJDzvyvjXCvmPj4ZnQqnCg4XM6nea81Aju9SDYK2FhzXmXf+3hyL2WlSAcugGINrqC7yZSnVjtrI7tUlfc0= 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+58850+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 1588927130443109.58354305644616; Fri, 8 May 2020 01:38:50 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id VpZXYY1788612xJCfeIhXp0T; Fri, 08 May 2020 01:38:50 -0700 X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.6879.1588927128006250571 for ; Fri, 08 May 2020 01:38:48 -0700 IronPort-SDR: P5gWE+YOq42AgoNsmFUL969JOGiAPa4qENpvU6jYGZ/uR2eVZ20L+WUjZYR90F8dJoNTt1aZun FHmLMns4C1Ig== 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:32 -0700 IronPort-SDR: FGaMiQOSK3AgIscy6arVenxPcsnOxreqNMuVXxnWeb0wXTTMAdZJOx2cm3mQHIp5MBf8iiCY/T 6aR+kkujyw1g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="305366573" 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:31 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Jian J Wang , Hao A Wu Subject: [edk2-devel] [PATCH 04/18] MdeModulePkg: Remove All UGA Support Date: Fri, 8 May 2020 16:38:10 +0800 Message-Id: <20200508083824.1785-5-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: ScwH9ZigFoUxN6cS6tKkFKgix1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588927130; bh=f6SIWnl8vkZt/PTjxr6b0jrkcNkqsh0KU7126EObUrg=; h=Cc:Date:From:Reply-To:Subject:To; b=RstiCPG8Afy7KsHteAK6mpujg4YHbno+ecYysBreM81yqDtfSp6kFSy9vCwjGy+8zbV dEUMJe/XFRJZJZVG/nJtiBpOpnt6CQr/lhYO1ZRl9cS03ASDVbxSiuw/RjIes5NMDHB5M DswJ6cm2nJNPWEJoXTjZaWErjmpiLU+s37Q= 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 All UGA Support in MdeModulePkg, first remove from library. Cc: Jian J Wang Cc: Hao A Wu Signed-off-by: Guomin Jiang --- MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c | 2 +- MdeModulePkg/Include/Library/BootLogoLib.h | 2 +- .../Library/BootLogoLib/BootLogoLib.c | 224 +++++------------- .../Library/BootLogoLib/BootLogoLib.inf | 4 - 4 files changed, 55 insertions(+), 177 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c b/MdeModulePkg/Bus/Pci= /PciBusDxe/PciBus.c index 64284ac8251c..2b03ecb258c6 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c @@ -49,7 +49,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_PCI_HOTPLUG_REQUEST_PRO= TOCOL mPciHotPlugReques Installs driver module protocols and. Creates virtual device handles for= ConIn, ConOut, and StdErr. Installs Simple Text In protocol, Simple Text In Ex = protocol, Simple Pointer protocol, Absolute Pointer protocol on those virtual hand= lers. - Installs Graphics Output protocol and/or UGA Draw protocol if needed. + Installs Graphics Output protocol if needed. =20 @param[in] ImageHandle The firmware allocated handle for the EFI imag= e. @param[in] SystemTable A pointer to the EFI System Table. diff --git a/MdeModulePkg/Include/Library/BootLogoLib.h b/MdeModulePkg/Incl= ude/Library/BootLogoLib.h index afd895b257c3..8af87790d1d3 100644 --- a/MdeModulePkg/Include/Library/BootLogoLib.h +++ b/MdeModulePkg/Include/Library/BootLogoLib.h @@ -27,7 +27,7 @@ BootLogoEnableLogo ( Use SystemTable ConOut to turn on video based Simple Text Out consoles. = The Simple Text Out screens will now be synced up with all non-video output = devices. =20 - @retval EFI_SUCCESS UGA devices are back in text mode and synced up. + @retval EFI_SUCCESS Devices are back in text mode and synced up. =20 **/ EFI_STATUS diff --git a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.c b/MdeModulePkg/= Library/BootLogoLib/BootLogoLib.c index 134660f28d34..ce8e725fedab 100644 --- a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.c +++ b/MdeModulePkg/Library/BootLogoLib/BootLogoLib.c @@ -12,7 +12,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include #include -#include #include #include #include @@ -47,9 +46,6 @@ BootLogoEnableLogo ( UINT32 Instance; EFI_IMAGE_INPUT Image; EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Blt; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; - UINT32 ColorDepth; - UINT32 RefreshRate; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; EFI_BOOT_LOGO_PROTOCOL *BootLogo; EDKII_BOOT_LOGO2_PROTOCOL *BootLogo2; @@ -68,21 +64,10 @@ BootLogoEnableLogo ( return EFI_UNSUPPORTED; } =20 - UgaDraw =3D NULL; // // Try to open GOP first // Status =3D gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiGraphicsOutp= utProtocolGuid, (VOID **) &GraphicsOutput); - if (EFI_ERROR (Status) && FeaturePcdGet (PcdUgaConsumeSupport)) { - GraphicsOutput =3D NULL; - // - // Open GOP failed, try to open UGA - // - Status =3D gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiUgaDrawPro= tocolGuid, (VOID **) &UgaDraw); - if (EFI_ERROR (Status)) { - UgaDraw =3D NULL; - } - } if (EFI_ERROR (Status)) { return EFI_UNSUPPORTED; } @@ -108,17 +93,8 @@ BootLogoEnableLogo ( // gST->ConOut->EnableCursor (gST->ConOut, FALSE); =20 - if (GraphicsOutput !=3D NULL) { - SizeOfX =3D GraphicsOutput->Mode->Info->HorizontalResolution; - SizeOfY =3D GraphicsOutput->Mode->Info->VerticalResolution; - - } else { - ASSERT (UgaDraw !=3D NULL); - Status =3D UgaDraw->GetMode (UgaDraw, &SizeOfX, &SizeOfY, &ColorDepth,= &RefreshRate); - if (EFI_ERROR (Status)) { - return EFI_UNSUPPORTED; - } - } + SizeOfX =3D GraphicsOutput->Mode->Info->HorizontalResolution; + SizeOfY =3D GraphicsOutput->Mode->Info->VerticalResolution; =20 Blt =3D NULL; NumberOfLogos =3D 0; @@ -205,34 +181,18 @@ BootLogoEnableLogo ( DestY +=3D OffsetY; =20 if ((DestX >=3D 0) && (DestY >=3D 0)) { - if (GraphicsOutput !=3D NULL) { - Status =3D GraphicsOutput->Blt ( - GraphicsOutput, - Blt, - EfiBltBufferToVideo, - 0, - 0, - (UINTN) DestX, - (UINTN) DestY, - Image.Width, - Image.Height, - Image.Width * sizeof (EFI_GRAPHICS_OUTP= UT_BLT_PIXEL) - ); - } else { - ASSERT (UgaDraw !=3D NULL); - Status =3D UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) Blt, - EfiUgaBltBufferToVideo, - 0, - 0, - (UINTN) DestX, - (UINTN) DestY, - Image.Width, - Image.Height, - Image.Width * sizeof (EFI_UGA_PIXEL) - ); - } + Status =3D GraphicsOutput->Blt ( + GraphicsOutput, + Blt, + EfiBltBufferToVideo, + 0, + 0, + (UINTN) DestX, + (UINTN) DestY, + Image.Width, + Image.Height, + Image.Width * sizeof (EFI_GRAPHICS_OUTPUT= _BLT_PIXEL) + ); =20 // // Report displayed Logo information. @@ -305,33 +265,18 @@ BootLogoEnableLogo ( return EFI_OUT_OF_RESOURCES; } =20 - if (GraphicsOutput !=3D NULL) { - Status =3D GraphicsOutput->Blt ( - GraphicsOutput, - LogoBlt, - EfiBltVideoToBltBuffer, - LogoDestX, - LogoDestY, - 0, - 0, - LogoWidth, - LogoHeight, - LogoWidth * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXE= L) - ); - } else { - Status =3D UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) LogoBlt, - EfiUgaVideoToBltBuffer, - LogoDestX, - LogoDestY, - 0, - 0, - LogoWidth, - LogoHeight, - LogoWidth * sizeof (EFI_UGA_PIXEL) - ); - } + Status =3D GraphicsOutput->Blt ( + GraphicsOutput, + LogoBlt, + EfiBltVideoToBltBuffer, + LogoDestX, + LogoDestY, + 0, + 0, + LogoWidth, + LogoHeight, + LogoWidth * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) + ); } =20 if (!EFI_ERROR (Status)) { @@ -363,7 +308,7 @@ BootLogoEnableLogo ( Use SystemTable Conout to turn on video based Simple Text Out consoles. = The Simple Text Out screens will now be synced up with all non video output = devices =20 - @retval EFI_SUCCESS UGA devices are back in text mode and synced up. + @retval EFI_SUCCESS GOP devices are back in text mode and synced up. =20 **/ EFI_STATUS @@ -408,11 +353,8 @@ BootLogoUpdateProgress ( { EFI_STATUS Status; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; UINT32 SizeOfX; UINT32 SizeOfY; - UINT32 ColorDepth; - UINT32 RefreshRate; EFI_GRAPHICS_OUTPUT_BLT_PIXEL Color; UINTN BlockHeight; UINTN BlockWidth; @@ -425,39 +367,13 @@ BootLogoUpdateProgress ( return EFI_INVALID_PARAMETER; } =20 - UgaDraw =3D NULL; Status =3D gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiGraphicsOutp= utProtocolGuid, (VOID **) &GraphicsOutput); - if (EFI_ERROR (Status) && FeaturePcdGet (PcdUgaConsumeSupport)) { - GraphicsOutput =3D NULL; - - Status =3D gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiUgaDrawPro= tocolGuid, (VOID **) &UgaDraw); - if (EFI_ERROR (Status)) { - UgaDraw =3D NULL; - } - } if (EFI_ERROR (Status)) { return EFI_UNSUPPORTED; } =20 - SizeOfX =3D 0; - SizeOfY =3D 0; - if (GraphicsOutput !=3D NULL) { - SizeOfX =3D GraphicsOutput->Mode->Info->HorizontalResolution; - SizeOfY =3D GraphicsOutput->Mode->Info->VerticalResolution; - } else if (UgaDraw !=3D NULL) { - Status =3D UgaDraw->GetMode ( - UgaDraw, - &SizeOfX, - &SizeOfY, - &ColorDepth, - &RefreshRate - ); - if (EFI_ERROR (Status)) { - return EFI_UNSUPPORTED; - } - } else { - return EFI_UNSUPPORTED; - } + SizeOfX =3D GraphicsOutput->Mode->Info->HorizontalResolution; + SizeOfY =3D GraphicsOutput->Mode->Info->VerticalResolution; =20 BlockWidth =3D SizeOfX / 100; BlockHeight =3D SizeOfY / 50; @@ -473,70 +389,36 @@ BootLogoUpdateProgress ( // SetMem (&Color, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0x0); =20 - if (GraphicsOutput !=3D NULL) { - Status =3D GraphicsOutput->Blt ( - GraphicsOutput, - &Color, - EfiBltVideoFill, - 0, - 0, - 0, - PosY - EFI_GLYPH_HEIGHT - 1, - SizeOfX, - SizeOfY - (PosY - EFI_GLYPH_HEIGHT - 1), - SizeOfX * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) - ); - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - Status =3D UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) &Color, - EfiUgaVideoFill, - 0, - 0, - 0, - PosY - EFI_GLYPH_HEIGHT - 1, - SizeOfX, - SizeOfY - (PosY - EFI_GLYPH_HEIGHT - 1), - SizeOfX * sizeof (EFI_UGA_PIXEL) - ); - } else { - return EFI_UNSUPPORTED; - } + Status =3D GraphicsOutput->Blt ( + GraphicsOutput, + &Color, + EfiBltVideoFill, + 0, + 0, + 0, + PosY - EFI_GLYPH_HEIGHT - 1, + SizeOfX, + SizeOfY - (PosY - EFI_GLYPH_HEIGHT - 1), + SizeOfX * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) + ); } // // Show progress by drawing blocks // for (Index =3D PreviousValue; Index < BlockNum; Index++) { PosX =3D Index * BlockWidth; - if (GraphicsOutput !=3D NULL) { - Status =3D GraphicsOutput->Blt ( - GraphicsOutput, - &ProgressColor, - EfiBltVideoFill, - 0, - 0, - PosX, - PosY, - BlockWidth - 1, - BlockHeight, - (BlockWidth) * sizeof (EFI_GRAPHICS_OUTPUT_BLT_P= IXEL) - ); - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - Status =3D UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) &ProgressColor, - EfiUgaVideoFill, - 0, - 0, - PosX, - PosY, - BlockWidth - 1, - BlockHeight, - (BlockWidth) * sizeof (EFI_UGA_PIXEL) - ); - } else { - return EFI_UNSUPPORTED; - } + Status =3D GraphicsOutput->Blt ( + GraphicsOutput, + &ProgressColor, + EfiBltVideoFill, + 0, + 0, + PosX, + PosY, + BlockWidth - 1, + BlockHeight, + (BlockWidth) * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIX= EL) + ); } =20 PrintXY ( diff --git a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf b/MdeModulePk= g/Library/BootLogoLib/BootLogoLib.inf index 7d50f2dfa3ab..03fd70451bc6 100644 --- a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf +++ b/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf @@ -42,11 +42,7 @@ [LibraryClasses] =20 [Protocols] gEfiGraphicsOutputProtocolGuid ## SOMETIMES_CONSUMES - gEfiUgaDrawProtocolGuid |PcdUgaConsumeSupport ## SOMETIMES_CONSUMES gEfiBootLogoProtocolGuid ## SOMETIMES_CONSUMES gEdkiiBootLogo2ProtocolGuid ## SOMETIMES_CONSUMES gEfiUserManagerProtocolGuid ## CONSUMES gEdkiiPlatformLogoProtocolGuid ## CONSUMES - -[FeaturePcd] - gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport ## CONSUMES --=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 (#58850): https://edk2.groups.io/g/devel/message/58850 Mute This Topic: https://groups.io/mt/74068782/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- From nobody Sun May 5 01:01:08 2024 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+58851+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+58851+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588927131; cv=none; d=zohomail.com; s=zohoarc; b=U/UrIFeivnDqrjTTaOpoo1PzxlvS7cbq5VVfpRcEkbxyOSwPvFulArYEWkQAHI5CZ8UC1NugJoOuuGyZ0lE36L1LJp+wOehIJarbEE/nBnwSchb0ugGrZ4IMGcD5xdeTblc0VDbrh8vHz4M8mXCUJrpDIngM3MP4JeeE7tn89TY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588927131; 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=RApjwsKTgmUcV3vH56REqo9fcuRQfeGPu37MfUnyNTw=; b=aiCO1YCbNr5M6w2SzaKJz8uLERhY4eeLmpmSNCDOo0CevEMEXrsP7/JPqbDsMgYbaC0E+ztF/SgAGZXfMiWpC3F3F/qGnzTsWwL+8sP6SWuzU/Jav7VW4zU9Y1XKVis8WPzjhY72j7KOq2G4rOQjS6WlGg4umyq6CqS7k52xJ+s= 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+58851+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 1588927131017305.7394549384953; Fri, 8 May 2020 01:38:51 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id tCpkYY1788612xavb4qDKaGL; Fri, 08 May 2020 01:38:50 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web12.6878.1588927126653624329 for ; Fri, 08 May 2020 01:38:48 -0700 IronPort-SDR: O0Qdljuk3p6wkX0rEOvn8QmXDDqN/PLC5xGWJGVP+85RBtYKI7WBN47cZMrSPjkBFyDj+01sld Ae966LCCfkYw== 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:34 -0700 IronPort-SDR: 4H8EQZocXdxKUJ8TR/ynEBWxsFTx7doglb39+f1gXNKCBcGsTyuhPz3U2ukildnpGhBi6xDDTL vAjc5Q4bjbGA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="305366584" 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:32 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Zhichao Gao , Ray Ni Subject: [edk2-devel] [PATCH 05/18] MdeModulePkg/ConSplitterDxe: Remove All UGA Support Date: Fri, 8 May 2020 16:38:11 +0800 Message-Id: <20200508083824.1785-6-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: kfwFXHdrAHxbZoanwUD9ahvMx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588927130; bh=6b0pR0o8dXdp1cHkjdVZgB+0TrmcrG3CI/XSJ0HJplQ=; h=Cc:Date:From:Reply-To:Subject:To; b=w5baUnFPsaWT8UpPCuMaBC1fRuyZ/juTNjXaI8OC9x64oSjwDU1N1QwKrlidYZx9EZg 3s3Cmu/9hTbMD20SC6o+1bRCL6vjqlDl1AXV1lYw8q+zrVUn1AzwTYMun4mu4Pg6wfCTa mP5fZ1zs+LSpd6xCxIce7gk0d8eVE5R1z4o= 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 All UGA Support in ConSplitterDxe component. Cc: Zhichao Gao Cc: Ray Ni Signed-off-by: Guomin Jiang --- .../Console/ConSplitterDxe/ConSplitter.c | 290 ++--------------- .../Console/ConSplitterDxe/ConSplitter.h | 135 +------- .../Console/ConSplitterDxe/ConSplitterDxe.inf | 14 +- .../Console/ConSplitterDxe/ConSplitterDxe.uni | 11 +- .../ConSplitterDxe/ConSplitterGraphics.c | 307 ------------------ 5 files changed, 41 insertions(+), 716 deletions(-) diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/= MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c index 9c38271b65f9..3fdeee4b409b 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c @@ -107,16 +107,6 @@ GLOBAL_REMOVE_IF_UNREFERENCED TEXT_IN_SPLITTER_PRIVATE= _DATA mConIn =3D { FALSE }; =20 - -// -// Uga Draw Protocol Private Data template -// -GLOBAL_REMOVE_IF_UNREFERENCED EFI_UGA_DRAW_PROTOCOL mUgaDrawProtocolTempla= te =3D { - ConSplitterUgaDrawGetMode, - ConSplitterUgaDrawSetMode, - ConSplitterUgaDrawBlt -}; - // // Graphics Output Protocol Private Data template // @@ -155,16 +145,6 @@ GLOBAL_REMOVE_IF_UNREFERENCED TEXT_OUT_SPLITTER_PRIVAT= E_DATA mConOut =3D { FALSE, }, =20 - { - NULL, - NULL, - NULL - }, - 0, - 0, - 0, - 0, - { NULL, NULL, @@ -173,7 +153,6 @@ GLOBAL_REMOVE_IF_UNREFERENCED TEXT_OUT_SPLITTER_PRIVATE= _DATA mConOut =3D { }, (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *) NULL, 0, - 0, =20 0, (TEXT_OUT_AND_GOP_DATA *) NULL, @@ -211,16 +190,6 @@ GLOBAL_REMOVE_IF_UNREFERENCED TEXT_OUT_SPLITTER_PRIVAT= E_DATA mStdErr =3D { FALSE, }, =20 - { - NULL, - NULL, - NULL - }, - 0, - 0, - 0, - 0, - { NULL, NULL, @@ -229,7 +198,6 @@ GLOBAL_REMOVE_IF_UNREFERENCED TEXT_OUT_SPLITTER_PRIVATE= _DATA mStdErr =3D { }, (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *) NULL, 0, - 0, =20 0, (TEXT_OUT_AND_GOP_DATA *) NULL, @@ -422,7 +390,7 @@ ToggleStateSyncReInitialization ( Installs driver module protocols and. Creates virtual device handles for= ConIn, ConOut, and StdErr. Installs Simple Text In protocol, Simple Text In Ex = protocol, Simple Pointer protocol, Absolute Pointer protocol on those virtual hand= lers. - Installs Graphics Output protocol and/or UGA Draw protocol if needed. + Installs Graphics Output protocol. =20 @param[in] ImageHandle The firmware allocated handle for the EFI imag= e. @param[in] SystemTable A pointer to the EFI System Table. @@ -494,10 +462,9 @@ ConSplitterDriverEntry( ASSERT_EFI_ERROR (Status); =20 // - // Either Graphics Output protocol or UGA Draw protocol must be supporte= d. + // Graphics Output protocol must be supported. // - ASSERT (FeaturePcdGet (PcdConOutGopSupport) || - FeaturePcdGet (PcdConOutUgaSupport)); + ASSERT (FeaturePcdGet (PcdConOutGopSupport)); =20 // // The driver creates virtual handles for ConIn, ConOut, StdErr. @@ -753,9 +720,6 @@ ConSplitterTextOutConstructor ( // // Copy protocols template // - if (FeaturePcdGet (PcdConOutUgaSupport)) { - CopyMem (&ConOutPrivate->UgaDraw, &mUgaDrawProtocolTemplate, sizeof (E= FI_UGA_DRAW_PROTOCOL)); - } if (FeaturePcdGet (PcdConOutGopSupport)) { CopyMem (&ConOutPrivate->GraphicsOutput, &mGraphicsOutputProtocolTempl= ate, sizeof (EFI_GRAPHICS_OUTPUT_PROTOCOL)); } @@ -801,12 +765,6 @@ ConSplitterTextOutConstructor ( TextOutSetMode (ConOutPrivate, 0); =20 =20 - if (FeaturePcdGet (PcdConOutUgaSupport)) { - // - // Setup the UgaDraw to 800 x 600 x 32 bits per pixel, 60Hz. - // - ConSplitterUgaDrawSetMode (&ConOutPrivate->UgaDraw, 800, 600, 32, 60); - } if (FeaturePcdGet (PcdConOutGopSupport)) { // // Setup resource for mode information in Graphics Output Protocol int= erface @@ -1332,7 +1290,6 @@ ConSplitterConOutDriverBindingStart ( EFI_STATUS Status; EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *TextOut; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; UINTN SizeOfInfo; EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info; =20 @@ -1353,7 +1310,6 @@ ConSplitterConOutDriverBindingStart ( } =20 GraphicsOutput =3D NULL; - UgaDraw =3D NULL; // // Try to Open Graphics Output protocol // @@ -1366,20 +1322,6 @@ ConSplitterConOutDriverBindingStart ( EFI_OPEN_PROTOCOL_GET_PROTOCOL ); =20 - if (EFI_ERROR (Status) && FeaturePcdGet (PcdUgaConsumeSupport)) { - // - // Open UGA DRAW protocol - // - gBS->OpenProtocol ( - ControllerHandle, - &gEfiUgaDrawProtocolGuid, - (VOID **) &UgaDraw, - This->DriverBindingHandle, - mConOut.VirtualHandle, - EFI_OPEN_PROTOCOL_GET_PROTOCOL - ); - } - // // When new console device is added, the new mode will be set later, // so put current mode back to init state. @@ -1390,36 +1332,17 @@ ConSplitterConOutDriverBindingStart ( // If both ConOut and StdErr incorporate the same Text Out device, // their MaxMode and QueryData should be the intersection of both. // - Status =3D ConSplitterTextOutAddDevice (&mConOut, TextOut, GraphicsOutpu= t, UgaDraw); + Status =3D ConSplitterTextOutAddDevice (&mConOut, TextOut, GraphicsOutpu= t); ConSplitterTextOutSetAttribute (&mConOut.TextOut, EFI_TEXT_ATTR (EFI_LIG= HTGRAY, EFI_BLACK)); =20 - if (FeaturePcdGet (PcdConOutUgaSupport)) { - // - // Get the UGA mode data of ConOut from the current mode - // - if (GraphicsOutput !=3D NULL) { - Status =3D GraphicsOutput->QueryMode (GraphicsOutput, GraphicsOutput= ->Mode->Mode, &SizeOfInfo, &Info); - if (EFI_ERROR (Status)) { - return Status; - } - ASSERT ( SizeOfInfo <=3D sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATIO= N)); - - mConOut.UgaHorizontalResolution =3D Info->HorizontalResolution; - mConOut.UgaVerticalResolution =3D Info->VerticalResolution; - mConOut.UgaColorDepth =3D 32; - mConOut.UgaRefreshRate =3D 60; - - FreePool (Info); - - } else if (UgaDraw !=3D NULL) { - Status =3D UgaDraw->GetMode ( - UgaDraw, - &mConOut.UgaHorizontalResolution, - &mConOut.UgaVerticalResolution, - &mConOut.UgaColorDepth, - &mConOut.UgaRefreshRate - ); + if (GraphicsOutput !=3D NULL) { + Status =3D GraphicsOutput->QueryMode (GraphicsOutput, GraphicsOutput->= Mode->Mode, &SizeOfInfo, &Info); + if (EFI_ERROR (Status)) { + return Status; } + ASSERT ( SizeOfInfo <=3D sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION)= ); + + FreePool (Info); } =20 return Status; @@ -1475,7 +1398,7 @@ ConSplitterStdErrDriverBindingStart ( // If both ConOut and StdErr incorporate the same Text Out device, // their MaxMode and QueryData should be the intersection of both. // - Status =3D ConSplitterTextOutAddDevice (&mStdErr, TextOut, NULL, NULL); + Status =3D ConSplitterTextOutAddDevice (&mStdErr, TextOut, NULL); ConSplitterTextOutSetAttribute (&mStdErr.TextOut, EFI_TEXT_ATTR (EFI_MAG= ENTA, EFI_BLACK)); =20 return Status; @@ -2729,7 +2652,6 @@ ConSplitterGetIntersectionBetweenConOutAndStrErr ( =20 @param Private Text Out Splitter pointer. @param GraphicsOutput Graphics Output protocol pointer. - @param UgaDraw UGA Draw protocol pointer. =20 @retval EFI_SUCCESS Output mode added successfully. @retval other Failed to add output mode. @@ -2738,8 +2660,7 @@ ConSplitterGetIntersectionBetweenConOutAndStrErr ( EFI_STATUS ConSplitterAddGraphicsOutputMode ( IN TEXT_OUT_SPLITTER_PRIVATE_DATA *Private, - IN EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput, - IN EFI_UGA_DRAW_PROTOCOL *UgaDraw + IN EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput ) { EFI_STATUS Status; @@ -2754,12 +2675,8 @@ ConSplitterAddGraphicsOutputMode ( UINTN NumberIndex; BOOLEAN Match; BOOLEAN AlreadyExist; - UINT32 UgaHorizontalResolution; - UINT32 UgaVerticalResolution; - UINT32 UgaColorDepth; - UINT32 UgaRefreshRate; =20 - ASSERT (GraphicsOutput !=3D NULL || UgaDraw !=3D NULL); + ASSERT (GraphicsOutput !=3D NULL); =20 CurrentGraphicsOutputMode =3D Private->GraphicsOutput.Mode; =20 @@ -2767,14 +2684,6 @@ ConSplitterAddGraphicsOutputMode ( CurrentIndex =3D 0; Status =3D EFI_SUCCESS; =20 - if (Private->CurrentNumberOfUgaDraw !=3D 0) { - // - // If any UGA device has already been added, then there is no need to - // calculate intersection of display mode of different GOP/UGA device, - // since only one display mode will be exported (i.e. user-defined mod= e) - // - goto Done; - } =20 if (GraphicsOutput !=3D NULL) { if (Private->CurrentNumberOfGraphicsOutput =3D=3D 0) { @@ -2921,49 +2830,11 @@ ConSplitterAddGraphicsOutputMode ( } } } - } else if (UgaDraw !=3D NULL) { - // - // Graphics console driver can ensure the same mode for all GOP devices - // so we can get the current mode from this video device - // - UgaDraw->GetMode ( - UgaDraw, - &UgaHorizontalResolution, - &UgaVerticalResolution, - &UgaColorDepth, - &UgaRefreshRate - ); - - CurrentGraphicsOutputMode->MaxMode =3D 1; - Info =3D CurrentGraphicsOutputMode->Info; - Info->Version =3D 0; - Info->HorizontalResolution =3D UgaHorizontalResolution; - Info->VerticalResolution =3D UgaVerticalResolution; - Info->PixelFormat =3D PixelBltOnly; - Info->PixelsPerScanLine =3D UgaHorizontalResolution; - CurrentGraphicsOutputMode->SizeOfInfo =3D sizeof (EFI_GRAPHICS_OU= TPUT_MODE_INFORMATION); - CurrentGraphicsOutputMode->FrameBufferBase =3D (EFI_PHYSICAL_ADDRESS) = (UINTN) NULL; - CurrentGraphicsOutputMode->FrameBufferSize =3D 0; - - // - // Update the private mode buffer - // - CopyMem (&Private->GraphicsOutputModeBuffer[0], Info, sizeof (EFI_GRAP= HICS_OUTPUT_MODE_INFORMATION)); - - // - // Only mode 0 is available to be set - // - CurrentIndex =3D 0; } =20 -Done: - if (GraphicsOutput !=3D NULL) { Private->CurrentNumberOfGraphicsOutput++; } - if (UgaDraw !=3D NULL) { - Private->CurrentNumberOfUgaDraw++; - } =20 // // Force GraphicsOutput mode to be set, @@ -3108,7 +2979,6 @@ ConsplitterSetConsoleOutMode ( @param Private Text Out Splitter pointer. @param TextOut Simple Text Output protocol pointer. @param GraphicsOutput Graphics Output protocol pointer. - @param UgaDraw UGA Draw protocol pointer. =20 @retval EFI_SUCCESS Text Output Device added successfully. @retval EFI_OUT_OF_RESOURCES Could not grow the buffer size. @@ -3118,17 +2988,12 @@ EFI_STATUS ConSplitterTextOutAddDevice ( IN TEXT_OUT_SPLITTER_PRIVATE_DATA *Private, IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *TextOut, - IN EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput, - IN EFI_UGA_DRAW_PROTOCOL *UgaDraw + IN EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput ) { EFI_STATUS Status; UINTN CurrentNumOfConsoles; INT32 MaxMode; - UINT32 UgaHorizontalResolution; - UINT32 UgaVerticalResolution; - UINT32 UgaColorDepth; - UINT32 UgaRefreshRate; TEXT_OUT_AND_GOP_DATA *TextAndGop; UINTN SizeOfInfo; EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info; @@ -3163,7 +3028,6 @@ ConSplitterTextOutAddDevice ( =20 TextAndGop->TextOut =3D TextOut; TextAndGop->GraphicsOutput =3D GraphicsOutput; - TextAndGop->UgaDraw =3D UgaDraw; =20 if (CurrentNumOfConsoles =3D=3D 0) { // @@ -3192,77 +3056,21 @@ ConSplitterTextOutAddDevice ( // // This device display mode will be added into Graphics Ouput modes. // - if ((GraphicsOutput !=3D NULL) || (UgaDraw !=3D NULL)) { - DeviceStatus =3D ConSplitterAddGraphicsOutputMode (Private, GraphicsOu= tput, UgaDraw); + if (GraphicsOutput !=3D NULL) { + DeviceStatus =3D ConSplitterAddGraphicsOutputMode (Private, GraphicsOu= tput); } =20 - if (FeaturePcdGet (PcdConOutUgaSupport)) { - // - // If UGA is produced by Consplitter - // - if (GraphicsOutput !=3D NULL) { - Status =3D GraphicsOutput->QueryMode (GraphicsOutput, GraphicsOutput= ->Mode->Mode, &SizeOfInfo, &Info); - if (EFI_ERROR (Status)) { - return Status; - } - ASSERT ( SizeOfInfo <=3D sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATIO= N)); - - UgaHorizontalResolution =3D Info->HorizontalResolution; - UgaVerticalResolution =3D Info->VerticalResolution; - - FreePool (Info); - - } else if (UgaDraw !=3D NULL) { - Status =3D UgaDraw->GetMode ( - UgaDraw, - &UgaHorizontalResolution, - &UgaVerticalResolution, - &UgaColorDepth, - &UgaRefreshRate - ); - if (!EFI_ERROR (Status) && EFI_ERROR (DeviceStatus)) { - // - // if GetMode is successfully and UGA device hasn't been set, set = it - // - Status =3D ConSplitterUgaDrawSetMode ( - &Private->UgaDraw, - UgaHorizontalResolution, - UgaVerticalResolution, - UgaColorDepth, - UgaRefreshRate - ); - } - // - // If GetMode/SetMode is failed, set to 800x600 mode - // - if(EFI_ERROR (Status)) { - Status =3D ConSplitterUgaDrawSetMode ( - &Private->UgaDraw, - 800, - 600, - 32, - 60 - ); - } - } + Status =3D GraphicsOutput->QueryMode (GraphicsOutput, GraphicsOutput->Mo= de->Mode, &SizeOfInfo, &Info); + if (EFI_ERROR (Status)) { + return Status; } + ASSERT ( SizeOfInfo <=3D sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION)); + FreePool (Info); =20 if (((!EFI_ERROR (DeviceStatus)) || (!EFI_ERROR (Status))) && - ((Private->CurrentNumberOfGraphicsOutput + Private->CurrentNumberOfU= gaDraw) =3D=3D 1)) { - if (!FeaturePcdGet (PcdConOutGopSupport)) { + ((Private->CurrentNumberOfGraphicsOutput) =3D=3D 1)) { // - // If Graphics Outpurt protocol not supported, UGA Draw protocol is = installed - // on the virtual handle. - // - Status =3D gBS->InstallMultipleProtocolInterfaces ( - &mConOut.VirtualHandle, - &gEfiUgaDrawProtocolGuid, - &mConOut.UgaDraw, - NULL - ); - } else if (!FeaturePcdGet (PcdConOutUgaSupport)) { - // - // If UGA Draw protocol not supported, Graphics Output Protocol is i= nstalled + // Graphics Output Protocol is installed // on virtual handle. // Status =3D gBS->InstallMultipleProtocolInterfaces ( @@ -3271,20 +3079,6 @@ ConSplitterTextOutAddDevice ( &mConOut.GraphicsOutput, NULL ); - } else { - // - // Boot Graphics Output protocol and UGA Draw protocol are supported, - // both they will be installed on virtual handle. - // - Status =3D gBS->InstallMultipleProtocolInterfaces ( - &mConOut.VirtualHandle, - &gEfiGraphicsOutputProtocolGuid, - &mConOut.GraphicsOutput, - &gEfiUgaDrawProtocolGuid, - &mConOut.UgaDraw, - NULL - ); - } } =20 // @@ -3329,9 +3123,6 @@ ConSplitterTextOutDeleteDevice ( TextOutList =3D Private->TextOutList; while (Index >=3D 0) { if (TextOutList->TextOut =3D=3D TextOut) { - if (TextOutList->UgaDraw !=3D NULL) { - Private->CurrentNumberOfUgaDraw--; - } if (TextOutList->GraphicsOutput !=3D NULL) { Private->CurrentNumberOfGraphicsOutput--; } @@ -3350,33 +3141,16 @@ ConSplitterTextOutDeleteDevice ( return EFI_NOT_FOUND; } =20 - if ((Private->CurrentNumberOfGraphicsOutput =3D=3D 0) && (Private->Curre= ntNumberOfUgaDraw =3D=3D 0)) { + if ((Private->CurrentNumberOfGraphicsOutput =3D=3D 0)) { // - // If there is not any physical GOP and UGA device in system, - // Consplitter GOP or UGA protocol will be uninstalled + // If there is not any physical GOP in system, + // Consplitter GOP protocol will be uninstalled // - if (!FeaturePcdGet (PcdConOutGopSupport)) { - Status =3D gBS->UninstallProtocolInterface ( - Private->VirtualHandle, - &gEfiUgaDrawProtocolGuid, - &Private->UgaDraw - ); - } else if (!FeaturePcdGet (PcdConOutUgaSupport)) { - Status =3D gBS->UninstallProtocolInterface ( - Private->VirtualHandle, - &gEfiGraphicsOutputProtocolGuid, - &Private->GraphicsOutput - ); - } else { - Status =3D gBS->UninstallMultipleProtocolInterfaces ( - Private->VirtualHandle, - &gEfiUgaDrawProtocolGuid, - &Private->UgaDraw, - &gEfiGraphicsOutputProtocolGuid, - &Private->GraphicsOutput, - NULL - ); - } + Status =3D gBS->UninstallProtocolInterface ( + Private->VirtualHandle, + &gEfiGraphicsOutputProtocolGuid, + &Private->GraphicsOutput + ); } =20 if (CurrentNumOfConsoles =3D=3D 0) { diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h b/= MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h index 419635c3f51f..32ad0888544b 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h @@ -21,7 +21,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include #include -#include =20 #include #include @@ -187,7 +186,6 @@ typedef struct { =20 typedef struct { EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *TextOut; } TEXT_OUT_AND_GOP_DATA; =20 @@ -200,16 +198,9 @@ typedef struct { EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL TextOut; EFI_SIMPLE_TEXT_OUTPUT_MODE TextOutMode; =20 - EFI_UGA_DRAW_PROTOCOL UgaDraw; - UINT32 UgaHorizontalResolution; - UINT32 UgaVerticalResolution; - UINT32 UgaColorDepth; - UINT32 UgaRefreshRate; - EFI_GRAPHICS_OUTPUT_PROTOCOL GraphicsOutput; EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *GraphicsOutputModeBuffer; UINTN CurrentNumberOfGraphicsOutput; - UINTN CurrentNumberOfUgaDraw; =20 UINTN CurrentNumberOfConsoles; TEXT_OUT_AND_GOP_DATA *TextOutList; @@ -236,13 +227,6 @@ typedef struct { TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE \ ) =20 -#define UGA_DRAW_SPLITTER_PRIVATE_DATA_FROM_THIS(a) \ - CR ((a), \ - TEXT_OUT_SPLITTER_PRIVATE_DATA, \ - UgaDraw, \ - TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE \ - ) - #define CONSOLE_CONTROL_SPLITTER_PRIVATE_DATA_FROM_THIS(a) \ CR ((a), \ TEXT_OUT_SPLITTER_PRIVATE_DATA, \ @@ -260,7 +244,7 @@ typedef struct { Installs driver module protocols and. Creates virtual device handles for= ConIn, ConOut, and StdErr. Installs Simple Text In protocol, Simple Text In Ex = protocol, Simple Pointer protocol, Absolute Pointer protocol on those virtual hand= lers. - Installs Graphics Output protocol and/or UGA Draw protocol if needed. + Installs Graphics Output protocol if needed. =20 @param[in] ImageHandle The firmware allocated handle for the EFI imag= e. @param[in] SystemTable A pointer to the EFI System Table. @@ -1216,7 +1200,6 @@ ConSplitterSimplePointerDeleteDevice ( @param Private Text Out Splitter pointer. @param TextOut Simple Text Output protocol pointer. @param GraphicsOutput Graphics Output protocol pointer. - @param UgaDraw UGA Draw protocol pointer. =20 @retval EFI_SUCCESS Text Output Device added successfully. @retval EFI_OUT_OF_RESOURCES Could not grow the buffer size. @@ -1226,8 +1209,7 @@ EFI_STATUS ConSplitterTextOutAddDevice ( IN TEXT_OUT_SPLITTER_PRIVATE_DATA *Private, IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *TextOut, - IN EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput, - IN EFI_UGA_DRAW_PROTOCOL *UgaDraw + IN EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput ); =20 /** @@ -1871,119 +1853,6 @@ ConSplitterGraphicsOutputBlt ( IN UINTN Delta OPTIONAL ); =20 - -/** - Return the current video mode information. - - @param This The EFI_UGA_DRAW_PROTOCOL instance. - @param HorizontalResolution The size of video screen in pixels in the = X dimension. - @param VerticalResolution The size of video screen in pixels in the = Y dimension. - @param ColorDepth Number of bits per pixel, currently define= d to be 32. - @param RefreshRate The refresh rate of the monitor in Hertz. - - @retval EFI_SUCCESS Mode information returned. - @retval EFI_NOT_STARTED Video display is not initialized. Call Set= Mode () - @retval EFI_INVALID_PARAMETER One of the input args was NULL. - -**/ -EFI_STATUS -EFIAPI -ConSplitterUgaDrawGetMode ( - IN EFI_UGA_DRAW_PROTOCOL *This, - OUT UINT32 *HorizontalResolution, - OUT UINT32 *VerticalResolution, - OUT UINT32 *ColorDepth, - OUT UINT32 *RefreshRate - ); - -/** - Set the current video mode information. - - @param This The EFI_UGA_DRAW_PROTOCOL instance. - @param HorizontalResolution The size of video screen in pixels in the X= dimension. - @param VerticalResolution The size of video screen in pixels in the Y= dimension. - @param ColorDepth Number of bits per pixel, currently defined= to be 32. - @param RefreshRate The refresh rate of the monitor in Hertz. - - @retval EFI_SUCCESS Mode information returned. - @retval EFI_NOT_STARTED Video display is not initialized. Call SetM= ode () - @retval EFI_OUT_OF_RESOURCES Out of resources. - -**/ -EFI_STATUS -EFIAPI -ConSplitterUgaDrawSetMode ( - IN EFI_UGA_DRAW_PROTOCOL *This, - IN UINT32 HorizontalResolution, - IN UINT32 VerticalResolution, - IN UINT32 ColorDepth, - IN UINT32 RefreshRate - ); - -/** - Blt a rectangle of pixels on the graphics screen. - - The following table defines actions for BltOperations. - - EfiUgaVideoFill: - Write data from the BltBuffer pixel (SourceX, SourceY) - directly to every pixel of the video display rectangle - (DestinationX, DestinationY) - (DestinationX + Width, DestinationY + Height). - Only one pixel will be used from the BltBuffer. Delta is NOT used. - EfiUgaVideoToBltBuffer: - Read data from the video display rectangle - (SourceX, SourceY) (SourceX + Width, SourceY + Height) and place it in - the BltBuffer rectangle (DestinationX, DestinationY ) - (DestinationX + Width, DestinationY + Height). If DestinationX or - DestinationY is not zero then Delta must be set to the length in bytes - of a row in the BltBuffer. - EfiUgaBltBufferToVideo: - Write data from the BltBuffer rectangle - (SourceX, SourceY) (SourceX + Width, SourceY + Height) directly to the - video display rectangle (DestinationX, DestinationY) - (DestinationX + Width, DestinationY + Height). If SourceX or SourceY is - not zero then Delta must be set to the length in bytes of a row in the - BltBuffer. - EfiUgaVideoToVideo: - Copy from the video display rectangle - (SourceX, SourceY) (SourceX + Width, SourceY + Height) . - to the video display rectangle (DestinationX, DestinationY) - (DestinationX + Width, DestinationY + Height). - The BltBuffer and Delta are not used in this mode. - - @param This Protocol instance pointer. - @param BltBuffer Buffer containing data to blit into video buffer.= This - buffer has a size of Width*Height*sizeof(EFI_UGA_= PIXEL) - @param BltOperation Operation to perform on BlitBuffer and video memo= ry - @param SourceX X coordinate of source for the BltBuffer. - @param SourceY Y coordinate of source for the BltBuffer. - @param DestinationX X coordinate of destination for the BltBuffer. - @param DestinationY Y coordinate of destination for the BltBuffer. - @param Width Width of rectangle in BltBuffer in pixels. - @param Height Hight of rectangle in BltBuffer in pixels. - @param Delta OPTIONAL - - @retval EFI_SUCCESS The Blt operation completed. - @retval EFI_INVALID_PARAMETER BltOperation is not valid. - @retval EFI_DEVICE_ERROR A hardware error occured writting to the = video buffer. - -**/ -EFI_STATUS -EFIAPI -ConSplitterUgaDrawBlt ( - IN EFI_UGA_DRAW_PROTOCOL *This, - IN EFI_UGA_PIXEL *BltBuffer, OPTIONAL - IN EFI_UGA_BLT_OPERATION BltOperation, - IN UINTN SourceX, - IN UINTN SourceY, - IN UINTN DestinationX, - IN UINTN DestinationY, - IN UINTN Width, - IN UINTN Height, - IN UINTN Delta OPTIONAL - ); - /** Sets the output device(s) to a specified mode. =20 diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.i= nf b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf index 9aa1dade752a..156757aee653 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf @@ -3,12 +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 and/or UGA Draw proto= col in system -# table according PCD settings(PcdConOutGopSupport, and PcdConOutUgaSuppor= t). It always -# consumes Graphics Output protocol which is produced by display device, a= nd consumes UGA Draw -# protocol which is produced by display device according to PcdUgaConsumeS= upport value. -# Note: If only UGA Draw protocol is installed in system, PcdUgaConsumeSup= port should be -# set to TRUE. +# 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 # # Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
# @@ -92,14 +89,9 @@ [Protocols] ## SOMETIMES_PRODUCES ## SOMETIMES_CONSUMES gEfiGraphicsOutputProtocolGuid - ## SOMETIMES_PRODUCES - ## SOMETIMES_CONSUMES - gEfiUgaDrawProtocolGuid =20 [FeaturePcd] gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport ## CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport ## CONSUMES - gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport ## CONSUMES =20 [Pcd] ## SOMETIMES_PRODUCES diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.u= ni b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni index 13c25b2a4ffc..903c505e303c 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni @@ -3,12 +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 and/or UGA Draw prot= ocol in system -// table according PCD settings(PcdConOutGopSupport, and PcdConOutUgaSuppo= rt). It always -// consumes Graphics Output protocol which is produced by display device, = and consumes UGA Draw -// protocol which is produced by display device according to PcdUgaConsume= Support value. -// Note: If only UGA Draw protocol is installed in system, PcdUgaConsumeSu= pport should be -// set to TRUE. +// 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 // // Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
// @@ -19,5 +16,5 @@ =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 and/or UGA Draw = protocol in system table according PCD settings(PcdConOutGopSupport, and Pc= dConOutUgaSupport). It always consumes Graphics Output protocol, which is p= roduced by display device, and consumes UGA Draw protocol, which is produce= d by display device according to PcdUgaConsumeSupport value. Note: If only = UGA Draw protocol is installed in system, PcdUgaConsumeSupport should be se= t to TRUE." +#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." =20 diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraph= ics.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c index ab1d2ddc4dc4..e8926db3e355 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c @@ -118,7 +118,6 @@ ConSplitterGraphicsOutputSetMode ( UINTN NumberIndex; UINTN SizeOfInfo; EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; =20 if (ModeNumber >=3D This->Mode->MaxMode) { return EFI_UNSUPPORTED; @@ -156,20 +155,6 @@ ConSplitterGraphicsOutputSetMode ( if (EFI_ERROR (Status)) { ReturnStatus =3D Status; } - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - UgaDraw =3D Private->TextOutList[Index].UgaDraw; - if (UgaDraw !=3D NULL) { - Status =3D UgaDraw->SetMode ( - UgaDraw, - Mode->HorizontalResolution, - Mode->VerticalResolution, - 32, - 60 - ); - if (EFI_ERROR (Status)) { - ReturnStatus =3D Status; - } - } } } =20 @@ -262,7 +247,6 @@ ConSplitterGraphicsOutputBlt ( TEXT_OUT_SPLITTER_PRIVATE_DATA *Private; UINTN Index; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; =20 if (This =3D=3D NULL || ((UINTN) BltOperation) >=3D EfiGraphicsOutputBlt= OperationMax) { return EFI_INVALID_PARAMETER; @@ -299,297 +283,6 @@ ConSplitterGraphicsOutputBlt ( return EFI_SUCCESS; } } - - UgaDraw =3D Private->TextOutList[Index].UgaDraw; - if (UgaDraw !=3D NULL && FeaturePcdGet (PcdUgaConsumeSupport)) { - Status =3D UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) BltBuffer, - (EFI_UGA_BLT_OPERATION) BltOperation, - SourceX, - SourceY, - DestinationX, - DestinationY, - Width, - Height, - Delta - ); - if (EFI_ERROR (Status)) { - ReturnStatus =3D Status; - } else if (BltOperation =3D=3D EfiBltVideoToBltBuffer) { - // - // Only need to read the data into buffer one time - // - return EFI_SUCCESS; - } - } - } - - return ReturnStatus; -} - -/** - Return the current video mode information. - - @param This The EFI_UGA_DRAW_PROTOCOL instance. - @param HorizontalResolution The size of video screen in pixels in the = X dimension. - @param VerticalResolution The size of video screen in pixels in the = Y dimension. - @param ColorDepth Number of bits per pixel, currently define= d to be 32. - @param RefreshRate The refresh rate of the monitor in Hertz. - - @retval EFI_SUCCESS Mode information returned. - @retval EFI_NOT_STARTED Video display is not initialized. Call Set= Mode () - @retval EFI_INVALID_PARAMETER One of the input args was NULL. - -**/ -EFI_STATUS -EFIAPI -ConSplitterUgaDrawGetMode ( - IN EFI_UGA_DRAW_PROTOCOL *This, - OUT UINT32 *HorizontalResolution, - OUT UINT32 *VerticalResolution, - OUT UINT32 *ColorDepth, - OUT UINT32 *RefreshRate - ) -{ - TEXT_OUT_SPLITTER_PRIVATE_DATA *Private; - - if ((HorizontalResolution =3D=3D NULL) || - (VerticalResolution =3D=3D NULL) || - (RefreshRate =3D=3D NULL) || - (ColorDepth =3D=3D NULL)) { - return EFI_INVALID_PARAMETER; - } - // - // retrieve private data - // - Private =3D UGA_DRAW_SPLITTER_PRIVATE_DATA_FROM_THIS (This= ); - - *HorizontalResolution =3D Private->UgaHorizontalResolution; - *VerticalResolution =3D Private->UgaVerticalResolution; - *ColorDepth =3D Private->UgaColorDepth; - *RefreshRate =3D Private->UgaRefreshRate; - - return EFI_SUCCESS; -} - - -/** - Set the current video mode information. - - @param This The EFI_UGA_DRAW_PROTOCOL instance. - @param HorizontalResolution The size of video screen in pixels in the X= dimension. - @param VerticalResolution The size of video screen in pixels in the Y= dimension. - @param ColorDepth Number of bits per pixel, currently defined= to be 32. - @param RefreshRate The refresh rate of the monitor in Hertz. - - @retval EFI_SUCCESS Mode information returned. - @retval EFI_NOT_STARTED Video display is not initialized. Call SetM= ode () - @retval EFI_OUT_OF_RESOURCES Out of resources. - -**/ -EFI_STATUS -EFIAPI -ConSplitterUgaDrawSetMode ( - IN EFI_UGA_DRAW_PROTOCOL *This, - IN UINT32 HorizontalResolution, - IN UINT32 VerticalResolution, - IN UINT32 ColorDepth, - IN UINT32 RefreshRate - ) -{ - EFI_STATUS Status; - TEXT_OUT_SPLITTER_PRIVATE_DATA *Private; - UINTN Index; - EFI_STATUS ReturnStatus; - EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - UINTN NumberIndex; - UINTN SizeOfInfo; - EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; - - Private =3D UGA_DRAW_SPLITTER_PRIVATE_DATA_FROM_THIS (This); - - ReturnStatus =3D EFI_SUCCESS; - - // - // Update the Mode data - // - Private->UgaHorizontalResolution =3D HorizontalResolution; - Private->UgaVerticalResolution =3D VerticalResolution; - Private->UgaColorDepth =3D ColorDepth; - Private->UgaRefreshRate =3D RefreshRate; - - // - // return the worst status met - // - for (Index =3D 0; Index < Private->CurrentNumberOfConsoles; Index++) { - - GraphicsOutput =3D Private->TextOutList[Index].GraphicsOutput; - if (GraphicsOutput !=3D NULL) { - // - // Find corresponding ModeNumber of this GraphicsOutput instance - // - for (NumberIndex =3D 0; NumberIndex < GraphicsOutput->Mode->MaxMode;= NumberIndex ++) { - Status =3D GraphicsOutput->QueryMode (GraphicsOutput, (UINT32) Num= berIndex, &SizeOfInfo, &Info); - if (EFI_ERROR (Status)) { - return Status; - } - if ((Info->HorizontalResolution =3D=3D HorizontalResolution) && (I= nfo->VerticalResolution =3D=3D VerticalResolution)) { - FreePool (Info); - break; - } - FreePool (Info); - } - - Status =3D GraphicsOutput->SetMode (GraphicsOutput, (UINT32) NumberI= ndex); - if (EFI_ERROR (Status)) { - ReturnStatus =3D Status; - } - } else if (FeaturePcdGet (PcdUgaConsumeSupport)){ - UgaDraw =3D Private->TextOutList[Index].UgaDraw; - if (UgaDraw !=3D NULL) { - Status =3D UgaDraw->SetMode ( - UgaDraw, - HorizontalResolution, - VerticalResolution, - ColorDepth, - RefreshRate - ); - if (EFI_ERROR (Status)) { - ReturnStatus =3D Status; - } - } - } - } - - return ReturnStatus; -} - - -/** - Blt a rectangle of pixels on the graphics screen. - - The following table defines actions for BltOperations. - - EfiUgaVideoFill: - Write data from the BltBuffer pixel (SourceX, SourceY) - directly to every pixel of the video display rectangle - (DestinationX, DestinationY) - (DestinationX + Width, DestinationY + Height). - Only one pixel will be used from the BltBuffer. Delta is NOT used. - EfiUgaVideoToBltBuffer: - Read data from the video display rectangle - (SourceX, SourceY) (SourceX + Width, SourceY + Height) and place it in - the BltBuffer rectangle (DestinationX, DestinationY ) - (DestinationX + Width, DestinationY + Height). If DestinationX or - DestinationY is not zero then Delta must be set to the length in bytes - of a row in the BltBuffer. - EfiUgaBltBufferToVideo: - Write data from the BltBuffer rectangle - (SourceX, SourceY) (SourceX + Width, SourceY + Height) directly to the - video display rectangle (DestinationX, DestinationY) - (DestinationX + Width, DestinationY + Height). If SourceX or SourceY is - not zero then Delta must be set to the length in bytes of a row in the - BltBuffer. - EfiUgaVideoToVideo: - Copy from the video display rectangle - (SourceX, SourceY) (SourceX + Width, SourceY + Height) . - to the video display rectangle (DestinationX, DestinationY) - (DestinationX + Width, DestinationY + Height). - The BltBuffer and Delta are not used in this mode. - - @param This Protocol instance pointer. - @param BltBuffer Buffer containing data to blit into video buffer.= This - buffer has a size of Width*Height*sizeof(EFI_UGA_= PIXEL) - @param BltOperation Operation to perform on BlitBuffer and video memo= ry - @param SourceX X coordinate of source for the BltBuffer. - @param SourceY Y coordinate of source for the BltBuffer. - @param DestinationX X coordinate of destination for the BltBuffer. - @param DestinationY Y coordinate of destination for the BltBuffer. - @param Width Width of rectangle in BltBuffer in pixels. - @param Height Hight of rectangle in BltBuffer in pixels. - @param Delta OPTIONAL - - @retval EFI_SUCCESS The Blt operation completed. - @retval EFI_INVALID_PARAMETER BltOperation is not valid. - @retval EFI_DEVICE_ERROR A hardware error occured writting to the = video buffer. - -**/ -EFI_STATUS -EFIAPI -ConSplitterUgaDrawBlt ( - IN EFI_UGA_DRAW_PROTOCOL *This, - IN EFI_UGA_PIXEL *BltBuffer, OPTIONAL - IN EFI_UGA_BLT_OPERATION BltOperation, - IN UINTN SourceX, - IN UINTN SourceY, - IN UINTN DestinationX, - IN UINTN DestinationY, - IN UINTN Width, - IN UINTN Height, - IN UINTN Delta OPTIONAL - ) -{ - EFI_STATUS Status; - TEXT_OUT_SPLITTER_PRIVATE_DATA *Private; - UINTN Index; - EFI_STATUS ReturnStatus; - EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - - Private =3D UGA_DRAW_SPLITTER_PRIVATE_DATA_FROM_THIS (This); - - ReturnStatus =3D EFI_SUCCESS; - // - // return the worst status met - // - for (Index =3D 0; Index < Private->CurrentNumberOfConsoles; Index++) { - GraphicsOutput =3D Private->TextOutList[Index].GraphicsOutput; - if (GraphicsOutput !=3D NULL) { - Status =3D GraphicsOutput->Blt ( - GraphicsOutput, - (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *) BltBuffer, - (EFI_GRAPHICS_OUTPUT_BLT_OPERATION) BltOpera= tion, - SourceX, - SourceY, - DestinationX, - DestinationY, - Width, - Height, - Delta - ); - if (EFI_ERROR (Status)) { - ReturnStatus =3D Status; - } else if (BltOperation =3D=3D EfiUgaVideoToBltBuffer) { - // - // Only need to read the data into buffer one time - // - return EFI_SUCCESS; - } - } - - if (Private->TextOutList[Index].UgaDraw !=3D NULL && FeaturePcdGet (Pc= dUgaConsumeSupport)) { - Status =3D Private->TextOutList[Index].UgaDraw->Blt ( - Private->TextOutList= [Index].UgaDraw, - BltBuffer, - BltOperation, - SourceX, - SourceY, - DestinationX, - DestinationY, - Width, - Height, - Delta - ); - if (EFI_ERROR (Status)) { - ReturnStatus =3D Status; - } else if (BltOperation =3D=3D EfiUgaVideoToBltBuffer) { - // - // Only need to read the data into buffer one time - // - return EFI_SUCCESS; - } - } } =20 return ReturnStatus; --=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 (#58851): https://edk2.groups.io/g/devel/message/58851 Mute This Topic: https://groups.io/mt/74068783/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- From nobody Sun May 5 01:01:08 2024 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+58852+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+58852+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588927131; cv=none; d=zohomail.com; s=zohoarc; b=D3v+MywFqK6yfXOWqhvc1YLG2j62odgWBpP8t/xgVFXFarFM7fO4IMTu5+XD+IQx5OpxPwb7N6i5u7TEhTHqAes+qGngtWr41TydCXtzDEVNLUmypXd3n13ArHNHD8SiucXL78Y4n7/53suw479ttn9fx6g5zS+5k+Di/PGXHMg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588927131; 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=D/JpOE+Bzd5msyoFx7Y166jzBJafmn/UhjdLsMJKMbg=; b=UXssyGGiT46TqbZoLVEWOPUKHOrxl9MhPGA0zEGSKrxjqMCz++u855eerkNYaly3txJdAapUzNft5/teoGeR1O0FgJqP83u2nSkWtvPW29OZTRjwFqM4WsUbyqjFqhrIp0h9XHj7IAF/OBV/aS7V00YGVPnC277KFR/qkrG45s8= 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+58852+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 1588927131688533.9555615283324; Fri, 8 May 2020 01:38:51 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id wcMBYY1788612xOTN6HAbNWg; Fri, 08 May 2020 01:38:51 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web12.6879.1588927128006250571 for ; Fri, 08 May 2020 01:38:48 -0700 IronPort-SDR: B4aaWioXbhv61f15EQ1t4d+w+TrD1OFngxvo6GyEhkV1V4OY3Pl9SRGOnZCKGfQMO5F12X71Fr 2fbUZn26Fagw== 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:36 -0700 IronPort-SDR: KP6XL+y4/VcCrranPnUOZlzmH4TQLybYGRSBGV1FzZIppb1DnqVlKTtrOko4vRNR76JK92uCNE Ez8mBB7YmM7w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="305366591" 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:34 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Dandan Bi , Eric Dong , Zhichao Gao , Ray Ni Subject: [edk2-devel] [PATCH 06/18] MdeModulePkg/GraphicsConsoleDxe: Remove All UGA Support Date: Fri, 8 May 2020 16:38:12 +0800 Message-Id: <20200508083824.1785-7-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: PHtp3deaQVt3ASHhsp2jbkK2x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588927131; bh=DlAF9ILwj0558cCEmbZyne0oBaRCpIAvi5vXmUlbHlw=; h=Cc:Date:From:Reply-To:Subject:To; b=E2Rzw4BWMRK/zBwFMS4IsNAHSfozfYCwYwJoj536aRWGlo05rY1UbNvqov2XZsDt00B f7PXFAOQc7t4ZdSxN+VNmT6qdeF3dBhc9C76SpCnHnxYlzRBnH3J9KnEqxXZwMs5xe4CT rHC2hkzaNalFFnLB2dQgzhnd1FufbrORQlI= 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 All UGA Support in GraphicsConsoleDxe, remove comment about UGA in HiiDatabaseDxe. Cc: Dandan Bi Cc: Eric Dong Cc: Zhichao Gao Cc: Ray Ni Signed-off-by: Guomin Jiang --- .../GraphicsConsoleDxe/GraphicsConsole.c | 299 +----------------- .../GraphicsConsoleDxe/GraphicsConsole.h | 19 +- .../GraphicsConsoleDxe/GraphicsConsoleDxe.inf | 6 +- .../GraphicsConsoleDxe/GraphicsConsoleDxe.uni | 4 +- MdeModulePkg/Universal/HiiDatabaseDxe/Image.c | 2 +- 5 files changed, 19 insertions(+), 311 deletions(-) diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsCons= ole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c index c042451a9b52..55c9e8f5ebf4 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c @@ -14,7 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent GRAPHICS_CONSOLE_DEV mGraphicsConsoleDevTemplate =3D { GRAPHICS_CONSOLE_DEV_SIGNATURE, (EFI_GRAPHICS_OUTPUT_PROTOCOL *) NULL, - (EFI_UGA_DRAW_PROTOCOL *) NULL, { GraphicsConsoleConOutReset, GraphicsConsoleConOutOutputString, @@ -99,9 +98,8 @@ EFI_DRIVER_BINDING_PROTOCOL gGraphicsConsoleDriverBinding= =3D { /** Test to see if Graphics Console could be supported on the Controller. =20 - Graphics Console could be supported if Graphics Output Protocol or UGA D= raw - Protocol exists on the Controller. (UGA Draw Protocol could be skipped - if PcdUgaConsumeSupport is set to FALSE.) + Graphics Console could be supported if Graphics Output Protocol + exists on the Controller. =20 @param This Protocol instance pointer. @param Controller Handle of device to test. @@ -122,11 +120,9 @@ GraphicsConsoleControllerDriverSupported ( { EFI_STATUS Status; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; EFI_DEVICE_PATH_PROTOCOL *DevicePath; =20 GraphicsOutput =3D NULL; - UgaDraw =3D NULL; // // Open the IO Abstraction(s) needed to perform the supported test // @@ -138,20 +134,6 @@ GraphicsConsoleControllerDriverSupported ( Controller, EFI_OPEN_PROTOCOL_BY_DRIVER ); - - if (EFI_ERROR (Status) && FeaturePcdGet (PcdUgaConsumeSupport)) { - // - // Open Graphics Output Protocol failed, try to open UGA Draw Protocol - // - Status =3D gBS->OpenProtocol ( - Controller, - &gEfiUgaDrawProtocolGuid, - (VOID **) &UgaDraw, - This->DriverBindingHandle, - Controller, - EFI_OPEN_PROTOCOL_BY_DRIVER - ); - } if (EFI_ERROR (Status)) { return Status; } @@ -196,13 +178,6 @@ GraphicsConsoleControllerDriverSupported ( This->DriverBindingHandle, Controller ); - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - gBS->CloseProtocol ( - Controller, - &gEfiUgaDrawProtocolGuid, - This->DriverBindingHandle, - Controller - ); } return Status; } @@ -351,9 +326,8 @@ InitializeGraphicsConsoleTextMode ( } =20 /** - Start this driver on Controller by opening Graphics Output protocol or - UGA Draw protocol, and installing Simple Text Out protocol on Controller. - (UGA Draw protocol could be skipped if PcdUgaConsumeSupport is set to FA= LSE.) + Start this driver on Controller by opening Graphics Output protocol + and installing Simple Text Out protocol on Controller. =20 @param This Protocol instance pointer. @param Controller Handle of device to bind driver to @@ -376,8 +350,6 @@ GraphicsConsoleControllerDriverStart ( GRAPHICS_CONSOLE_DEV *Private; UINT32 HorizontalResolution; UINT32 VerticalResolution; - UINT32 ColorDepth; - UINT32 RefreshRate; UINT32 ModeIndex; UINTN MaxMode; UINT32 ModeNumber; @@ -414,18 +386,6 @@ GraphicsConsoleControllerDriverStart ( Controller, EFI_OPEN_PROTOCOL_BY_DRIVER ); - - if (EFI_ERROR(Status) && FeaturePcdGet (PcdUgaConsumeSupport)) { - Status =3D gBS->OpenProtocol ( - Controller, - &gEfiUgaDrawProtocolGuid, - (VOID **) &Private->UgaDraw, - This->DriverBindingHandle, - Controller, - EFI_OPEN_PROTOCOL_BY_DRIVER - ); - } - if (EFI_ERROR (Status)) { goto Error; } @@ -512,43 +472,6 @@ GraphicsConsoleControllerDriverStart ( goto Error; } } - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - // - // At first try to set user-defined resolution - // - ColorDepth =3D 32; - RefreshRate =3D 60; - Status =3D Private->UgaDraw->SetMode ( - Private->UgaDraw, - HorizontalResolution, - VerticalResolution, - ColorDepth, - RefreshRate - ); - if (EFI_ERROR (Status)) { - // - // Try to set 800*600 which is required by UEFI/EFI spec - // - Status =3D Private->UgaDraw->SetMode ( - Private->UgaDraw, - 800, - 600, - ColorDepth, - RefreshRate - ); - if (EFI_ERROR (Status)) { - Status =3D Private->UgaDraw->GetMode ( - Private->UgaDraw, - &HorizontalResolution, - &VerticalResolution, - &ColorDepth, - &RefreshRate - ); - if (EFI_ERROR (Status)) { - goto Error; - } - } - } } =20 DEBUG ((EFI_D_INFO, "GraphicsConsole video resolution %d x %d\n", Horizo= ntalResolution, VerticalResolution)); @@ -613,7 +536,7 @@ GraphicsConsoleControllerDriverStart ( Error: if (EFI_ERROR (Status)) { // - // Close the GOP and UGA Draw Protocol + // Close the GOP // if (Private->GraphicsOutput !=3D NULL) { gBS->CloseProtocol ( @@ -622,13 +545,6 @@ GraphicsConsoleControllerDriverStart ( This->DriverBindingHandle, Controller ); - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - gBS->CloseProtocol ( - Controller, - &gEfiUgaDrawProtocolGuid, - This->DriverBindingHandle, - Controller - ); } =20 if (Private->LineBuffer !=3D NULL) { @@ -650,9 +566,7 @@ GraphicsConsoleControllerDriverStart ( =20 /** Stop this driver on Controller by removing Simple Text Out protocol - and closing the Graphics Output Protocol or UGA Draw protocol on Control= ler. - (UGA Draw protocol could be skipped if PcdUgaConsumeSupport is set to FA= LSE.) - + and closing the Graphics Output Protocol on Controller. =20 @param This Protocol instance pointer. @param Controller Handle of device to stop driver on @@ -701,7 +615,7 @@ GraphicsConsoleControllerDriverStop ( =20 if (!EFI_ERROR (Status)) { // - // Close the GOP or UGA IO Protocol + // Close the GOP Protocol // if (Private->GraphicsOutput !=3D NULL) { gBS->CloseProtocol ( @@ -710,13 +624,6 @@ GraphicsConsoleControllerDriverStop ( This->DriverBindingHandle, Controller ); - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - gBS->CloseProtocol ( - Controller, - &gEfiUgaDrawProtocolGuid, - This->DriverBindingHandle, - Controller - ); } =20 if (Private->LineBuffer !=3D NULL) { @@ -905,7 +812,6 @@ GraphicsConsoleConOutOutputString ( { GRAPHICS_CONSOLE_DEV *Private; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; INTN Mode; UINTN MaxColumn; UINTN MaxRow; @@ -939,7 +845,6 @@ GraphicsConsoleConOutOutputString ( Mode =3D This->Mode->Mode; Private =3D GRAPHICS_CONSOLE_CON_OUT_DEV_FROM_THIS (This); GraphicsOutput =3D Private->GraphicsOutput; - UgaDraw =3D Private->UgaDraw; =20 MaxColumn =3D Private->ModeData[Mode].Columns; MaxRow =3D Private->ModeData[Mode].Rows; @@ -1029,38 +934,6 @@ GraphicsConsoleConOutOutputString ( EFI_GLYPH_HEIGHT, Delta ); - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - // - // Scroll Screen Up One Row - // - UgaDraw->Blt ( - UgaDraw, - NULL, - EfiUgaVideoToVideo, - DeltaX, - DeltaY + EFI_GLYPH_HEIGHT, - DeltaX, - DeltaY, - Width, - Height, - Delta - ); - - // - // Print Blank Line at last line - // - UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) (UINTN) &Background, - EfiUgaVideoFill, - 0, - 0, - DeltaX, - DeltaY + Height, - Width, - EFI_GLYPH_HEIGHT, - Delta - ); } } else { This->Mode->CursorRow++; @@ -1300,19 +1173,13 @@ GraphicsConsoleConOutSetMode ( GRAPHICS_CONSOLE_DEV *Private; GRAPHICS_CONSOLE_MODE_DATA *ModeData; EFI_GRAPHICS_OUTPUT_BLT_PIXEL *NewLineBuffer; - UINT32 HorizontalResolution; - UINT32 VerticalResolution; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; - UINT32 ColorDepth; - UINT32 RefreshRate; EFI_TPL OldTpl; =20 OldTpl =3D gBS->RaiseTPL (TPL_NOTIFY); =20 Private =3D GRAPHICS_CONSOLE_CON_OUT_DEV_FROM_THIS (This); GraphicsOutput =3D Private->GraphicsOutput; - UgaDraw =3D Private->UgaDraw; =20 // // Make sure the requested mode number is supported @@ -1345,7 +1212,7 @@ GraphicsConsoleConOutSetMode ( goto Done; } // - // Otherwise, the size of the text console and/or the GOP/UGA mode wil= l be changed, + // Otherwise, the size of the text console and/or the GOP mode will be= changed, // so erase the cursor, and free the LineBuffer for the current mode // FlushCursor (This); @@ -1401,51 +1268,6 @@ GraphicsConsoleConOutSetMode ( 0 ); } - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - // - // Get the current UGA Draw mode information - // - Status =3D UgaDraw->GetMode ( - UgaDraw, - &HorizontalResolution, - &VerticalResolution, - &ColorDepth, - &RefreshRate - ); - if (EFI_ERROR (Status) || HorizontalResolution !=3D ModeData->GopWidth= || VerticalResolution !=3D ModeData->GopHeight) { - // - // Either no graphics mode is currently set, or it is set to the wro= ng resolution, so set the new graphics mode - // - Status =3D UgaDraw->SetMode ( - UgaDraw, - ModeData->GopWidth, - ModeData->GopHeight, - 32, - 60 - ); - if (EFI_ERROR (Status)) { - // - // The mode set operation failed - // - goto Done; - } - } else { - // - // The current graphics mode is correct, so simply clear the entire = display - // - Status =3D UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) (UINTN) &mGraphicsEfiColors[0], - EfiUgaVideoFill, - 0, - 0, - 0, - 0, - ModeData->GopWidth, - ModeData->GopHeight, - 0 - ); - } } =20 // @@ -1539,7 +1361,6 @@ GraphicsConsoleConOutClearScreen ( GRAPHICS_CONSOLE_DEV *Private; GRAPHICS_CONSOLE_MODE_DATA *ModeData; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; EFI_GRAPHICS_OUTPUT_BLT_PIXEL Foreground; EFI_GRAPHICS_OUTPUT_BLT_PIXEL Background; EFI_TPL OldTpl; @@ -1555,7 +1376,6 @@ GraphicsConsoleConOutClearScreen ( =20 Private =3D GRAPHICS_CONSOLE_CON_OUT_DEV_FROM_THIS (This); GraphicsOutput =3D Private->GraphicsOutput; - UgaDraw =3D Private->UgaDraw; ModeData =3D &(Private->ModeData[This->Mode->Mode]); =20 GetTextColors (This, &Foreground, &Background); @@ -1572,19 +1392,6 @@ GraphicsConsoleConOutClearScreen ( ModeData->GopHeight, 0 ); - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - Status =3D UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) (UINTN) &Background, - EfiUgaVideoFill, - 0, - 0, - 0, - 0, - ModeData->GopWidth, - ModeData->GopHeight, - 0 - ); } else { Status =3D EFI_UNSUPPORTED; } @@ -1747,7 +1554,7 @@ GetTextColors ( @param Count The count of Unicode string. =20 @retval EFI_OUT_OF_RESOURCES If no memory resource to use. - @retval EFI_UNSUPPORTED If no Graphics Output protocol and UGA Draw + @retval EFI_UNSUPPORTED If no Graphics Output protocol protocol exist. @retval EFI_SUCCESS Drawing Unicode string implemented success= fully. =20 @@ -1764,9 +1571,6 @@ DrawUnicodeWeightAtCursorN ( EFI_IMAGE_OUTPUT *Blt; EFI_STRING String; EFI_FONT_DISPLAY_INFO *FontInfo; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; - EFI_HII_ROW_INFO *RowInfoArray; - UINTN RowInfoArraySize; =20 Private =3D GRAPHICS_CONSOLE_CON_OUT_DEV_FROM_THIS (This); Blt =3D (EFI_IMAGE_OUTPUT *) AllocateZeroPool (sizeof (EFI_IMAGE_OUTPUT)= ); @@ -1817,63 +1621,6 @@ DrawUnicodeWeightAtCursorN ( NULL ); =20 - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - // - // If Graphics Output protocol cannot be found and PcdUgaConsumeSuppor= t enabled, - // using UGA Draw protocol to draw. - // - ASSERT (Private->UgaDraw!=3D NULL); - - UgaDraw =3D Private->UgaDraw; - - Blt->Image.Bitmap =3D AllocateZeroPool (Blt->Width * Blt->Height * siz= eof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); - if (Blt->Image.Bitmap =3D=3D NULL) { - FreePool (Blt); - FreePool (String); - return EFI_OUT_OF_RESOURCES; - } - - RowInfoArray =3D NULL; - // - // StringToImage only support blt'ing image to device using GOP proto= col. If GOP is not supported in this platform, - // we ask StringToImage to print the string to blt buffer, then blt t= o device using UgaDraw. - // - Status =3D mHiiFont->StringToImage ( - mHiiFont, - EFI_HII_IGNORE_IF_NO_GLYPH | EFI_HII_IGNORE_LINE= _BREAK, - String, - FontInfo, - &Blt, - This->Mode->CursorColumn * EFI_GLYPH_WIDTH + Pri= vate->ModeData[This->Mode->Mode].DeltaX, - This->Mode->CursorRow * EFI_GLYPH_HEIGHT + Priva= te->ModeData[This->Mode->Mode].DeltaY, - &RowInfoArray, - &RowInfoArraySize, - NULL - ); - - if (!EFI_ERROR (Status)) { - // - // Line breaks are handled by caller of DrawUnicodeWeightAtCursorN, = so the updated parameter RowInfoArraySize by StringToImage will - // always be 1 or 0 (if there is no valid Unicode Char can be printe= d). ASSERT here to make sure. - // - ASSERT (RowInfoArraySize <=3D 1); - - Status =3D UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) Blt->Image.Bitmap, - EfiUgaBltBufferToVideo, - This->Mode->CursorColumn * EFI_GLYPH_WIDTH + Pr= ivate->ModeData[This->Mode->Mode].DeltaX, - (This->Mode->CursorRow) * EFI_GLYPH_HEIGHT + Pri= vate->ModeData[This->Mode->Mode].DeltaY, - This->Mode->CursorColumn * EFI_GLYPH_WIDTH + Pr= ivate->ModeData[This->Mode->Mode].DeltaX, - (This->Mode->CursorRow) * EFI_GLYPH_HEIGHT + Pri= vate->ModeData[This->Mode->Mode].DeltaY, - RowInfoArray[0].LineWidth, - RowInfoArray[0].LineHeight, - Blt->Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIX= EL) - ); - } - - FreePool (RowInfoArray); - FreePool (Blt->Image.Bitmap); } else { Status =3D EFI_UNSUPPORTED; } @@ -1913,7 +1660,6 @@ FlushCursor ( INTN GlyphX; INTN GlyphY; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION Foreground; EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION Background; EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION BltChar[EFI_GLYPH_HEIGHT][EFI_GLYPH_= WIDTH]; @@ -1928,7 +1674,6 @@ FlushCursor ( =20 Private =3D GRAPHICS_CONSOLE_CON_OUT_DEV_FROM_THIS (This); GraphicsOutput =3D Private->GraphicsOutput; - UgaDraw =3D Private->UgaDraw; =20 // // In this driver, only narrow character was supported. @@ -1951,19 +1696,6 @@ FlushCursor ( EFI_GLYPH_HEIGHT, EFI_GLYPH_WIDTH * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) ); - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) (UINTN) BltChar, - EfiUgaVideoToBltBuffer, - GlyphX, - GlyphY, - 0, - 0, - EFI_GLYPH_WIDTH, - EFI_GLYPH_HEIGHT, - EFI_GLYPH_WIDTH * sizeof (EFI_UGA_PIXEL) - ); } =20 GetTextColors (This, &Foreground.Pixel, &Background.Pixel); @@ -1992,19 +1724,6 @@ FlushCursor ( EFI_GLYPH_HEIGHT, EFI_GLYPH_WIDTH * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) ); - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) (UINTN) BltChar, - EfiUgaBltBufferToVideo, - 0, - 0, - GlyphX, - GlyphY, - EFI_GLYPH_WIDTH, - EFI_GLYPH_HEIGHT, - EFI_GLYPH_WIDTH * sizeof (EFI_UGA_PIXEL) - ); } =20 return EFI_SUCCESS; diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsCons= ole.h b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h index 28d47ac7cb1e..de10e133809a 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h @@ -12,7 +12,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include #include -#include #include #include #include @@ -60,7 +59,6 @@ typedef struct { typedef struct { UINTN Signature; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL SimpleTextOutput; EFI_SIMPLE_TEXT_OUTPUT_MODE SimpleTextOutputMode; GRAPHICS_CONSOLE_MODE_DATA *ModeData; @@ -422,9 +420,8 @@ GraphicsConsoleConOutEnableCursor ( /** Test to see if Graphics Console could be supported on the Controller. =20 - Graphics Console could be supported if Graphics Output Protocol or UGA D= raw - Protocol exists on the Controller. (UGA Draw Protocol could be skipped - if PcdUgaConsumeSupport is set to FALSE.) + Graphics Console could be supported if Graphics Output Protocol + exists on the Controller. =20 @param This Protocol instance pointer. @param Controller Handle of device to test. @@ -445,9 +442,8 @@ GraphicsConsoleControllerDriverSupported ( =20 =20 /** - Start this driver on Controller by opening Graphics Output protocol or - UGA Draw protocol, and installing Simple Text Out protocol on Controller. - (UGA Draw protocol could be skipped if PcdUgaConsumeSupport is set to FA= LSE.) + Start this driver on Controller by opening Graphics Output protocol + and installing Simple Text Out protocol on Controller. =20 @param This Protocol instance pointer. @param Controller Handle of device to bind driver to @@ -468,9 +464,7 @@ GraphicsConsoleControllerDriverStart ( =20 /** Stop this driver on Controller by removing Simple Text Out protocol - and closing the Graphics Output Protocol or UGA Draw protocol on Control= ler. - (UGA Draw protocol could be skipped if PcdUgaConsumeSupport is set to FA= LSE.) - + and closing the Graphics Output Protocol on Controller. =20 @param This Protocol instance pointer. @param Controller Handle of device to stop driver on @@ -534,8 +528,7 @@ GetTextColors ( @param Count The count of Unicode string. =20 @retval EFI_OUT_OF_RESOURCES If no memory resource to use. - @retval EFI_UNSUPPORTED If no Graphics Output protocol and UGA Draw - protocol exist. + @retval EFI_UNSUPPORTED If no Graphics Output protocol exist. @retval EFI_SUCCESS Drawing Unicode string implemented success= fully. =20 **/ diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsCons= oleDxe.inf b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsCons= oleDxe.inf index bcfd306eee13..975871b76d05 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.= inf +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.= inf @@ -2,7 +2,7 @@ # Console support on graphic devices. # # This driver will install Simple Text Output protocol by consuming Graph= ices Output -# protocol or UGA Draw protocol on graphic devices. +# protocol on graphic devices. # # Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent @@ -53,15 +53,11 @@ [Protocols] gEfiDevicePathProtocolGuid ## TO_START gEfiSimpleTextOutProtocolGuid ## BY_START gEfiGraphicsOutputProtocolGuid ## TO_START - gEfiUgaDrawProtocolGuid ## TO_START gEfiHiiFontProtocolGuid ## TO_START ## TO_START ## NOTIFY gEfiHiiDatabaseProtocolGuid =20 -[FeaturePcd] - gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport ## CONSUMES - [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution ## SOMETIMES= _CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution ## SOMETIMES= _CONSUMES diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsCons= oleDxe.uni b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsCons= oleDxe.uni index aec5d57f9038..45dbb24c8bca 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.= uni +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.= uni @@ -2,7 +2,7 @@ // Console support on graphic devices. // // This driver will install Simple Text Output protocol by consuming Graph= ices Output -// protocol or UGA Draw protocol on graphic devices. +// protocol on graphic devices. // // Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
// @@ -14,5 +14,5 @@ #string STR_MODULE_ABSTRACT #language en-US "Console support o= n graphic devices" =20 #string STR_MODULE_DESCRIPTION #language en-US "This driver will = install SimpleTextOutputProtocol by consuming GraphicesOutput\n" - "Protocol or UgaDr= awProtocol on graphics devices." + "Protocol on graph= ics devices." =20 diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c b/MdeModulePkg/U= niversal/HiiDatabaseDxe/Image.c index a108fc6157a2..57f6fad15ea3 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c @@ -1381,7 +1381,7 @@ HiiDrawImage ( // if ((Flags & EFI_HII_DIRECT_TO_SCREEN) =3D=3D EFI_HII_DIRECT_TO_SCREEN= ) { // - // Caller should make sure the current UGA console is grarphic mode. + // Caller should make sure the current console is grarphic mode. // =20 // --=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 (#58852): https://edk2.groups.io/g/devel/message/58852 Mute This Topic: https://groups.io/mt/74068785/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- From nobody Sun May 5 01:01:08 2024 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+58853+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+58853+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588927130; cv=none; d=zohomail.com; s=zohoarc; b=kn50nwfemARnr7usScY8WPBKVHr2YaGow7qBmvkXodiI8px9K5G1irojK3MuSj5IG7sGkjOMiu0uA0nseV6wX0pyL2jfD64+muc87iG9JKYkksPiHvC6FrDuLl2JuNgZHB6McOlL8a012cgvbvXeyno29vT9/3/4yoYGO7F0DnU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588927130; 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=JrdWkerb9bh4fmacIDBA74YHw+YWiHld3A1NRlEVF00=; b=nLvWD/pvy7SzmYPlKFhvXpPrqMszicTQ3GJcLl3clV1qBEobfrKISnWB676D8SM2WqVl6M2FGf1ptiABCYn/7czzPT+nCIRIfnxBGvIgIRnRniZrcgonvI1noif/KsgGkBxBXuC9dkJHz2z46Uzt1bOTdYzCH+K38NvdmjbxA9U= 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+58853+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 1588927130044936.6812956713243; Fri, 8 May 2020 01:38:50 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id YkfGYY1788612xtMnehl9ISp; Fri, 08 May 2020 01:38:49 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web12.6878.1588927126653624329 for ; Fri, 08 May 2020 01:38:48 -0700 IronPort-SDR: g3xJPy8Ck6G3f+c2aA/OTB+abrTOokJ9tgZ6MSfoSyDEnz3cm3UhV3/7d+HHGhGQexZrdvb6jI XBl8LqPsAemA== 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:38 -0700 IronPort-SDR: Gz+0MEBR98WRzrOfEh6EMgLydmAjq25S/cuqjnjoZHhulYd7vfrCevqBSsKamDHwWweD5qi6c8 pqEX4/7KCIUA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="305366601" 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:36 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Jordan Justen , Andrew Fish , Ray Ni Subject: [edk2-devel] [PATCH 07/18] EmulatorPkg: Remove All UGA Support Date: Fri, 8 May 2020 16:38:13 +0800 Message-Id: <20200508083824.1785-8-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: KaBK2Q7UNEnP5lkRyIwj5zy5x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588927129; bh=gY1Hl7Rq4IWKJyXRKqCSstcPMM8GmsEVt+wvRSiC1NU=; h=Cc:Date:From:Reply-To:Subject:To; b=Vp47LkwdXjogJjaPlWqDNFDrTP0xjhGVbWRqaudEcMC7BOFycVKtO6wJ9prxo0T2ckE AZyIZAcUmes/kPaOS8iwhcsLSRojt1CDCMhYbbvsNwjavpPWGQFElvdj0hTZQI5m4PWFr Z9Qxro1HTzciCeZ31BsxGd8v7UrcFm8UC/U= 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 All UGA Support in EmulatorPkg. Cc: Jordan Justen Cc: Andrew Fish Cc: Ray Ni Signed-off-by: Guomin Jiang --- EmulatorPkg/EmuGopDxe/Gop.h | 8 ++- EmulatorPkg/EmuGopDxe/GopScreen.c | 14 ++--- EmulatorPkg/Include/Protocol/EmuFileSystem.h | 18 +++---- .../Include/Protocol/EmuGraphicsWindow.h | 18 +++---- .../Library/PlatformBmLib/PlatformBm.h | 2 +- .../Library/PlatformBmLib/PlatformBmData.c | 4 +- EmulatorPkg/Unix/Host/Gasket.h | 9 +--- EmulatorPkg/Unix/Host/Host.h | 1 - EmulatorPkg/Unix/Host/Ia32/Gasket.S | 2 +- EmulatorPkg/Unix/Host/X11GraphicsWindow.c | 54 +++++++++---------- EmulatorPkg/Unix/Host/X64/Gasket.S | 2 +- EmulatorPkg/Win/Host/WinGopScreen.c | 4 +- 12 files changed, 64 insertions(+), 72 deletions(-) diff --git a/EmulatorPkg/EmuGopDxe/Gop.h b/EmulatorPkg/EmuGopDxe/Gop.h index 389666327651..5376e8077ea2 100644 --- a/EmulatorPkg/EmuGopDxe/Gop.h +++ b/EmulatorPkg/EmuGopDxe/Gop.h @@ -6,8 +6,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 -#ifndef __UGA_H_ -#define __UGA_H_ +#ifndef __GOP_H_ +#define __GOP_H_ =20 #include =20 @@ -63,8 +63,6 @@ typedef struct { extern EFI_DRIVER_BINDING_PROTOCOL gEmuGopDriverBinding; extern EFI_COMPONENT_NAME_PROTOCOL gEmuGopComponentName; =20 -#define EMU_UGA_CLASS_NAME L"EmuGopWindow" - #define GOP_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('G', 'o', 'p', 'N') typedef struct { UINT64 Signature; @@ -87,7 +85,7 @@ typedef struct { =20 =20 // - // UGA Private Data knowing when to start hardware + // @todo GOP?? Private Data knowing when to start hardware // BOOLEAN HardwareNeedsStarting; =20 diff --git a/EmulatorPkg/EmuGopDxe/GopScreen.c b/EmulatorPkg/EmuGopDxe/GopS= creen.c index fbac649f8b3e..6ae5a07ba0c5 100644 --- a/EmulatorPkg/EmuGopDxe/GopScreen.c +++ b/EmulatorPkg/EmuGopDxe/GopScreen.c @@ -10,7 +10,7 @@ Module Name: =20 Abstract: =20 - This file produces the graphics abstration of UGA. It is called by + This file produces the graphics abstration of GOP. It is called by EmuGopDriver.c file which deals with the EFI 1.1 driver model. This file just does graphics. =20 @@ -215,7 +215,7 @@ EmuGopBlt ( // the number of bytes in each row can be computed. // if (Delta =3D=3D 0) { - Delta =3D Width * sizeof (EFI_UGA_PIXEL); + Delta =3D Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL); } =20 // @@ -226,8 +226,8 @@ EmuGopBlt ( OriginalTPL =3D gBS->RaiseTPL (TPL_NOTIFY); =20 // - // Pack UGA Draw protocol parameters to EMU_GRAPHICS_WINDOWS__BLT_ARGS s= tructure to adapt to - // GopBlt() API of Unix UGA IO protocol. + // Pack GOP protocol parameters to EMU_GRAPHICS_WINDOWS__BLT_ARGS struct= ure to adapt to + // GopBlt() API of GOP protocol. // GopBltArgs.DestinationX =3D DestinationX; GopBltArgs.DestinationY =3D DestinationY; @@ -238,8 +238,8 @@ EmuGopBlt ( GopBltArgs.Delta =3D Delta; Status =3D Private->EmuGraphicsWindow->Blt ( Private->EmuGraphicsWindow, - (EFI_UGA_PIXEL *)BltBuffer, - (EFI_UGA_BLT_OPERATION)BltOperation, + BltBuffer, + BltOperation, &GopBltArgs ); =20 @@ -391,7 +391,7 @@ ShutdownGopEvent ( =20 Routine Description: =20 - This is the UGA screen's callback notification function for exit-boot-se= rvices. + This is the screen's callback notification function for exit-boot-servic= es. All we do here is call EmuGopDestructor(). =20 Arguments: diff --git a/EmulatorPkg/Include/Protocol/EmuFileSystem.h b/EmulatorPkg/Inc= lude/Protocol/EmuFileSystem.h index 8ac9d9ba5dd3..eba747062c44 100644 --- a/EmulatorPkg/Include/Protocol/EmuFileSystem.h +++ b/EmulatorPkg/Include/Protocol/EmuFileSystem.h @@ -13,13 +13,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 -#ifndef _EMU_UGA_IO_H_ -#define _EMU_UGA_IO_H_ +#ifndef _EMU_GRAPHICS_WINDOW_H_ +#define _EMU_GRAPHICS_WINDOW_H_ =20 #include #include #include -#include +#include =20 #define EMU_GRAPHICS_WINDOW_PROTOCOL_GUID \ { 0x30FD316A, 0x6728, 0x2E41, { 0xA6, 0x90, 0x0D, 0x13, 0x33, 0xD8, 0xCA,= 0xC1 } } @@ -29,13 +29,13 @@ typedef struct _EMU_GRAPHICS_WINDOW_PROTOCOL EMU_GRAPHI= CS_WINDOW_PROTOCOL; typedef EFI_STATUS (EFIAPI *EMU_GRAPHICS_WINDOWS_CLOSE)( - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows ); =20 typedef EFI_STATUS (EFIAPI *EMU_GRAPHICS_WINDOWS_SIZE)( - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga, + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows, UINT32 Width, UINT32 Height ); @@ -43,13 +43,13 @@ EFI_STATUS typedef EFI_STATUS (EFIAPI *EMU_GRAPHICS_WINDOWS_CHECK_KEY)( - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows ); =20 typedef EFI_STATUS (EFIAPI *EMU_GRAPHICS_WINDOWS_GET_KEY)( - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga, + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows, EFI_KEY_DATA *key ); =20 @@ -91,8 +91,8 @@ typedef EFI_STATUS (EFIAPI *EMU_GRAPHICS_WINDOWS_BLT)( IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows, - IN EFI_UGA_PIXEL *BltBuffer OPTIONAL, - IN EFI_UGA_BLT_OPERATION BltOperation, + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL, + IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation, IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args ); =20 diff --git a/EmulatorPkg/Include/Protocol/EmuGraphicsWindow.h b/EmulatorPkg= /Include/Protocol/EmuGraphicsWindow.h index 07d4070b3584..e9b85c8eb373 100644 --- a/EmulatorPkg/Include/Protocol/EmuGraphicsWindow.h +++ b/EmulatorPkg/Include/Protocol/EmuGraphicsWindow.h @@ -6,13 +6,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 -#ifndef _EMU_UGA_IO_H_ -#define _EMU_UGA_IO_H_ +#ifndef _EMU_GRAPHICS_WINDOW_H_ +#define _EMU_GRAPHICS_WINDOW_H_ =20 #include #include #include -#include +#include =20 #define EMU_GRAPHICS_WINDOW_PROTOCOL_GUID \ { 0x30FD316A, 0x6728, 0x2E41, { 0xA6, 0x90, 0x0D, 0x13, 0x33, 0xD8, 0xCA,= 0xC1 } } @@ -22,13 +22,13 @@ typedef struct _EMU_GRAPHICS_WINDOW_PROTOCOL EMU_GRAPHI= CS_WINDOW_PROTOCOL; typedef EFI_STATUS (EFIAPI *EMU_GRAPHICS_WINDOWS_CLOSE)( - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindow ); =20 typedef EFI_STATUS (EFIAPI *EMU_GRAPHICS_WINDOWS_SIZE)( - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga, + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindow, UINT32 Width, UINT32 Height ); @@ -36,13 +36,13 @@ EFI_STATUS typedef EFI_STATUS (EFIAPI *EMU_GRAPHICS_WINDOWS_CHECK_KEY)( - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindow ); =20 typedef EFI_STATUS (EFIAPI *EMU_GRAPHICS_WINDOWS_GET_KEY)( - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga, + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindow, EFI_KEY_DATA *key ); =20 @@ -85,8 +85,8 @@ typedef EFI_STATUS (EFIAPI *EMU_GRAPHICS_WINDOWS_BLT)( IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows, - IN EFI_UGA_PIXEL *BltBuffer OPTIONAL, - IN EFI_UGA_BLT_OPERATION BltOperation, + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL, + IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation, IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args ); =20 diff --git a/EmulatorPkg/Library/PlatformBmLib/PlatformBm.h b/EmulatorPkg/L= ibrary/PlatformBmLib/PlatformBm.h index ce508b6b58f5..7bf9909511f0 100644 --- a/EmulatorPkg/Library/PlatformBmLib/PlatformBm.h +++ b/EmulatorPkg/Library/PlatformBmLib/PlatformBm.h @@ -61,7 +61,7 @@ typedef struct { EMU_VENDOR_DEVICE_PATH_NODE EmuBus; EMU_VENDOR_DEVICE_PATH_NODE EmuGraphicsWindow; EFI_DEVICE_PATH_PROTOCOL End; -} EMU_PLATFORM_UGA_DEVICE_PATH; +} EMU_PLATFORM_GRAPHICS_WINDOW_DEVICE_PATH; =20 =20 // diff --git a/EmulatorPkg/Library/PlatformBmLib/PlatformBmData.c b/EmulatorP= kg/Library/PlatformBmLib/PlatformBmData.c index 115102160605..5c2f9a6a4df4 100644 --- a/EmulatorPkg/Library/PlatformBmLib/PlatformBmData.c +++ b/EmulatorPkg/Library/PlatformBmLib/PlatformBmData.c @@ -10,7 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 =20 =20 -EMU_PLATFORM_UGA_DEVICE_PATH gGopDevicePath =3D { +EMU_PLATFORM_GRAPHICS_WINDOW_DEVICE_PATH gGopDevicePath =3D { { { { @@ -42,7 +42,7 @@ EMU_PLATFORM_UGA_DEVICE_PATH gGopDevicePath =3D { gEndEntire }; =20 -EMU_PLATFORM_UGA_DEVICE_PATH gGopDevicePath2 =3D { +EMU_PLATFORM_GRAPHICS_WINDOW_DEVICE_PATH gGopDevicePath2 =3D { { { { diff --git a/EmulatorPkg/Unix/Host/Gasket.h b/EmulatorPkg/Unix/Host/Gasket.h index e082397d23fb..1b67264f3e0e 100644 --- a/EmulatorPkg/Unix/Host/Gasket.h +++ b/EmulatorPkg/Unix/Host/Gasket.h @@ -206,11 +206,6 @@ ReverseGasketUint64Uint64 ( VOID *Key ); =20 -// -// Gasket functions for EFI_EMU_UGA_IO_PROTOCOL -// - - EFI_STATUS EFIAPI GasketX11Size ( @@ -253,8 +248,8 @@ EFI_STATUS EFIAPI GasketX11Blt ( IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows, - IN EFI_UGA_PIXEL *BltBuffer OPTIONAL, - IN EFI_UGA_BLT_OPERATION BltOperation, + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL, + IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation, IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args ); =20 diff --git a/EmulatorPkg/Unix/Host/Host.h b/EmulatorPkg/Unix/Host/Host.h index 9791cf8c370e..ccae162ed4a6 100644 --- a/EmulatorPkg/Unix/Host/Host.h +++ b/EmulatorPkg/Unix/Host/Host.h @@ -106,7 +106,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include #include -#include #include =20 #include diff --git a/EmulatorPkg/Unix/Host/Ia32/Gasket.S b/EmulatorPkg/Unix/Host/Ia= 32/Gasket.S index 36197ff26028..6fcdd265cf30 100644 --- a/EmulatorPkg/Unix/Host/Ia32/Gasket.S +++ b/EmulatorPkg/Unix/Host/Ia32/Gasket.S @@ -371,7 +371,7 @@ ASM_PFX(GasketSecEmuThunkAddress): ret =20 // -// Gasket functions for EFI_EMU_UGA_IO_PROTOCOL +// Gasket functions for EFI_EMU_GRAPHICS_WINDOW_PROTOCOL // =20 ASM_GLOBAL ASM_PFX(GasketX11Size) diff --git a/EmulatorPkg/Unix/Host/X11GraphicsWindow.c b/EmulatorPkg/Unix/H= ost/X11GraphicsWindow.c index 5325a0e35bf9..d4ef053db1bc 100644 --- a/EmulatorPkg/Unix/Host/X11GraphicsWindow.c +++ b/EmulatorPkg/Unix/Host/X11GraphicsWindow.c @@ -591,8 +591,8 @@ HandleEvents ( =20 unsigned long X11PixelToColor ( - IN GRAPHICS_IO_PRIVATE *Drv, - IN EFI_UGA_PIXEL pixel + IN GRAPHICS_IO_PRIVATE *Drv, + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL pixel ) { return ((pixel.Red >> Drv->r.csize) << Drv->r.shift) @@ -600,15 +600,15 @@ X11PixelToColor ( | ((pixel.Blue >> Drv->b.csize) << Drv->b.shift); } =20 -EFI_UGA_PIXEL +EFI_GRAPHICS_OUTPUT_BLT_PIXEL X11ColorToPixel ( IN GRAPHICS_IO_PRIVATE *Drv, IN unsigned long val ) { - EFI_UGA_PIXEL Pixel; + EFI_GRAPHICS_OUTPUT_BLT_PIXEL Pixel; =20 - memset (&Pixel, 0, sizeof (EFI_UGA_PIXEL)); + memset (&Pixel, 0, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); =20 // Truncation not an issue since X11 and EFI are both using 8 bits per c= olor Pixel.Red =3D (val >> Drv->r.shift) << Drv->r.csize; @@ -675,7 +675,7 @@ X11KeySetState ( if ((Drv->KeyState.KeyToggleState & EFI_CAPS_LOCK_ACTIVE) =3D=3D 0) { // // We could create an XKeyEvent and send a XK_Caps_Lock to - // the UGA/GOP Window + // the GOP Window // } } @@ -708,8 +708,8 @@ X11RegisterKeyNotify ( EFI_STATUS X11Blt ( IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo, - IN EFI_UGA_PIXEL *BltBuffer OPTIONAL, - IN EFI_UGA_BLT_OPERATION BltOperation, + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL, + IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation, IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args ) { @@ -719,7 +719,7 @@ X11Blt ( UINTN DstX; UINTN SrcX; UINTN Index; - EFI_UGA_PIXEL *Blt; + EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Blt; UINT8 *Dst; UINT8 *Src; UINTN Nbr; @@ -732,8 +732,8 @@ X11Blt ( // // Check bounds // - if (BltOperation =3D=3D EfiUgaVideoToBltBuffer - || BltOperation =3D=3D EfiUgaVideoToVideo) { + if (BltOperation =3D=3D EfiBltVideoToBltBuffer + || BltOperation =3D=3D EfiBltVideoToVideo) { // // Source is Video. // @@ -746,9 +746,9 @@ X11Blt ( } } =20 - if (BltOperation =3D=3D EfiUgaBltBufferToVideo - || BltOperation =3D=3D EfiUgaVideoToVideo - || BltOperation =3D=3D EfiUgaVideoFill) { + if (BltOperation =3D=3D EfiBltBufferToVideo + || BltOperation =3D=3D EfiBltVideoToVideo + || BltOperation =3D=3D EfiBltVideoFill) { // // Destination is Video // @@ -762,28 +762,28 @@ X11Blt ( } =20 switch (BltOperation) { - case EfiUgaVideoToBltBuffer: - Blt =3D (EFI_UGA_PIXEL *)((UINT8 *)BltBuffer + (Args->DestinationY * A= rgs->Delta) + Args->DestinationX * sizeof (EFI_UGA_PIXEL)); - Args->Delta -=3D Args->Width * sizeof (EFI_UGA_PIXEL); + case EfiBltVideoToBltBuffer: + Blt =3D (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)((UINT8 *)BltBuffer + (Args->= DestinationY * Args->Delta) + Args->DestinationX * sizeof (EFI_GRAPHICS_OUT= PUT_BLT_PIXEL)); + Args->Delta -=3D Args->Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL); for (SrcY =3D Args->SourceY; SrcY < (Args->Height + Args->SourceY); Sr= cY++) { for (SrcX =3D Args->SourceX; SrcX < (Args->Width + Args->SourceX); S= rcX++) { *Blt++ =3D X11ColorToPixel (Private, XGetPixel (Private->image, Sr= cX, SrcY)); } - Blt =3D (EFI_UGA_PIXEL *) ((UINT8 *) Blt + Args->Delta); + Blt =3D (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)((UINT8 *) Blt + Args->Delt= a); } break; - case EfiUgaBltBufferToVideo: - Blt =3D (EFI_UGA_PIXEL *)((UINT8 *)BltBuffer + (Args->SourceY * Args->= Delta) + Args->SourceX * sizeof (EFI_UGA_PIXEL)); - Args->Delta -=3D Args->Width * sizeof (EFI_UGA_PIXEL); + case EfiBltBufferToVideo: + Blt =3D (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)((UINT8 *)BltBuffer + (Args->= SourceY * Args->Delta) + Args->SourceX * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PI= XEL)); + Args->Delta -=3D Args->Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL); for (DstY =3D Args->DestinationY; DstY < (Args->Height + Args->Destina= tionY); DstY++) { for (DstX =3D Args->DestinationX; DstX < (Args->Width + Args->Destin= ationX); DstX++) { XPutPixel(Private->image, DstX, DstY, X11PixelToColor(Private, *Bl= t)); Blt++; } - Blt =3D (EFI_UGA_PIXEL *) ((UINT8 *) Blt + Args->Delta); + Blt =3D (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)((UINT8 *) Blt + Args->Del= ta); } break; - case EfiUgaVideoToVideo: + case EfiBltVideoToVideo: Dst =3D Private->image_data + (Args->DestinationX << Private->pixel_sh= ift) + Args->DestinationY * Private->line_bytes; Src =3D Private->image_data + (Args->SourceX << Private->pixel_shift) @@ -809,7 +809,7 @@ X11Blt ( } } break; - case EfiUgaVideoFill: + case EfiBltVideoFill: Color =3D X11PixelToColor(Private, *BltBuffer); for (DstY =3D Args->DestinationY; DstY < (Args->Height + Args->Destina= tionY); DstY++) { for (DstX =3D Args->DestinationX; DstX < (Args->Width + Args->Destin= ationX); DstX++) { @@ -825,7 +825,7 @@ X11Blt ( // Refresh screen. // switch (BltOperation) { - case EfiUgaVideoToVideo: + case EfiBltVideoToVideo: XCopyArea( Private->display, Private->win, Private->win, Private->gc, Args->SourceX, Args->SourceY, Args->Width, Args->Height, @@ -840,7 +840,7 @@ X11Blt ( } } break; - case EfiUgaVideoFill: + case EfiBltVideoFill: Color =3D X11PixelToColor (Private, *BltBuffer); XSetForeground (Private->display, Private->gc, Color); XFillRectangle ( @@ -849,7 +849,7 @@ X11Blt ( ); XFlush (Private->display); break; - case EfiUgaBltBufferToVideo: + case EfiBltBufferToVideo: Redraw (Private, Args->DestinationX, Args->DestinationY, Args->Width, = Args->Height); break; default: diff --git a/EmulatorPkg/Unix/Host/X64/Gasket.S b/EmulatorPkg/Unix/Host/X64= /Gasket.S index 030faa8e4c36..1b4614ab618d 100644 --- a/EmulatorPkg/Unix/Host/X64/Gasket.S +++ b/EmulatorPkg/Unix/Host/X64/Gasket.S @@ -427,7 +427,7 @@ ASM_PFX(GasketSecEmuThunkAddress): ret =20 // -// Gasket functions for EFI_EMU_UGA_IO_PROTOCOL +// Gasket functions for EFI_EMU_GRAPHICS_WINDOW_PROTOCOL // =20 ASM_GLOBAL ASM_PFX(GasketX11Size) diff --git a/EmulatorPkg/Win/Host/WinGopScreen.c b/EmulatorPkg/Win/Host/Win= GopScreen.c index 74011e225e30..9c51cc326ba5 100644 --- a/EmulatorPkg/Win/Host/WinGopScreen.c +++ b/EmulatorPkg/Win/Host/WinGopScreen.c @@ -322,8 +322,8 @@ WinNtWndSize ( EFI_STATUS WinNtWndBlt ( IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo, - IN EFI_UGA_PIXEL *BltBuffer OPTIONAL, - IN EFI_UGA_BLT_OPERATION BltOperation, + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL, + IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation, IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args ) { --=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 (#58853): https://edk2.groups.io/g/devel/message/58853 Mute This Topic: https://groups.io/mt/74068786/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- From nobody Sun May 5 01:01:08 2024 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+58855+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+58855+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588927132; cv=none; d=zohomail.com; s=zohoarc; b=bGfxxN5BdTTHpjHN4t/u//vNbhUJR6k/d9LrJgEafcR8Zr6/0M6TMISQry+XA6Ozedm5eiDVcHhg0QY3835ZYiapMFH25meGBULd19Xs04HFkia7xvkXW0NP7EhFUEA3m8pOA9hqwPaA7WdokU6R/lTcrfNW/XMDlANQpg7lZ7Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588927132; 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=cdWj2u7AMN1wT0Ay2LSZWnnAoty2mf7C8yL8i0rVIBA=; b=m7v9nZw8V8VhoqoPVdfsWqIA9tra7xZOQ4YhqAP6WGg6o8NqHSmCNbyIBjx2xNeKz+IgmGYEaIrBZFjFMMabyYbf4WTRaWxZ/hvy4opjQoCZlFRrrCc3W2Saq2CtFYlvl/C0bJ/1eoERqRJvOd9XTNEozvTOATbrCk1N9dnKNRo= 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+58855+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 1588927132563330.15526319312823; Fri, 8 May 2020 01:38:52 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Zo5rYY1788612x2dLdyhIJPb; Fri, 08 May 2020 01:38:52 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web12.6879.1588927128006250571 for ; Fri, 08 May 2020 01:38:49 -0700 IronPort-SDR: 6AVjD3/M+z2iSVqzLC1liaNgMAoqJHz7cep9R2FTmgPN+Vsjq9bikbr7u/vzzTQjXSsVC8pfVX KzKL+i8p554w== 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:39 -0700 IronPort-SDR: IRFDHGwADxTL+i6ydBRq7K4I4g5g51skvjsTh14OgUlmGot+qLTzosPcrRB7VLuO41J+Q7BgUU yA81RYXIWQYw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="305366607" 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:38 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH 08/18] OvmfPkg: Remove All UGA Support Date: Fri, 8 May 2020 16:38:14 +0800 Message-Id: <20200508083824.1785-9-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: lQum30WEyxlts9Nr1FkATtDEx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588927132; bh=gK1bKi6KXevTRi0+TpUalxC1DmnUj9hSst1ZFsGVl6o=; h=Cc:Date:From:Reply-To:Subject:To; b=a50fsWP9tzVoyyKAOlzB7dUe3hhjGgGKLGbWuj3l7oEsLtrLGM90ZDm6urlkw1HSsPu sXuD6OmQNV8TkBm9pfX2GGXYo4rusANE/Lmz1beHHDllsoIh3Gnh41ezHiJwcccUbncG7 HtaXZ8CKnjw5nTNSbti4iQd136nJ4CRNl5o= 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 All UGA Support in OvmfPkg. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Signed-off-by: Guomin Jiang --- OvmfPkg/OvmfPkgIa32.dsc | 1 - OvmfPkg/OvmfPkgIa32X64.dsc | 1 - OvmfPkg/OvmfPkgX64.dsc | 1 - OvmfPkg/OvmfXen.dsc | 1 - 4 files changed, 4 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 7c8b51f43b66..404450e91491 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -450,7 +450,6 @@ [PcdsFeatureFlag] gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE !ifdef $(CSM_ENABLE) gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable|TRUE diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index a0596c44168c..aaa408ac456a 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -454,7 +454,6 @@ [PcdsFeatureFlag] gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE !ifdef $(CSM_ENABLE) gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable|TRUE diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 2e764b6b7233..554515d6a9b8 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -454,7 +454,6 @@ [PcdsFeatureFlag] gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE !ifdef $(CSM_ENABLE) gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable|TRUE diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc index 8b3615e0b07e..70fbe8f0ddf3 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -335,7 +335,6 @@ [PcdsFeatureFlag] gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE !ifdef $(CSM_ENABLE) gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable|TRUE --=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 (#58855): https://edk2.groups.io/g/devel/message/58855 Mute This Topic: https://groups.io/mt/74068788/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- From nobody Sun May 5 01:01:08 2024 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+58856+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+58856+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588927132; cv=none; d=zohomail.com; s=zohoarc; b=ny6jCho36fRFKlfCiwSEljSra8NQFezQYMkdKGY45VMIo2BOuWn1U5Ojd2TelaXDK+KSUYM82VqcMk6Dc9DNIcC0U2a3Ja0RzX4RcEKB7w2HtdRAVSjNGjbEj1oyPWWRnN0WVn5+KaupWZi8Im8B7r35nHXPgcRoQ7SvGgYgHPY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588927132; 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=tVMysM89VuV1807SPPpGMOe+IVz51AyErjWL8YXQ/3A=; b=cPti9GgXvLQNO6pJb/9K6HzR9IGY7F32/q0siAWdcMgxbvWPNuIWTUIpLeYJozLlrt+KecLLZ55JX0WzY3++eeBUHa8GKrpOEO/CZhajlI5W5B796wMsuvdC1dy8VgMLjgd9nVFJZkjUhRWJrRTvNR026MuqMWTaHzwa5ngPypU= 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+58856+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 1588927132284767.7392344899167; Fri, 8 May 2020 01:38:52 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id oUidYY1788612x2hqRHp1wLO; Fri, 08 May 2020 01:38:51 -0700 X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web11.6709.1588927129284553090 for ; Fri, 08 May 2020 01:38:49 -0700 IronPort-SDR: 7XCpsaq2iH5uniHUqgBE2P0Yo6cHXsqEymEubmagmdP+1CiBs+yIRHeJqUFxOBJLj7m1LDHYXy JHa/aa1rkSSg== 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:41 -0700 IronPort-SDR: cCnv12yQxE25VqoIaXikMxhsoDnMpl4lTmTTnEUR30TJ8u8xWvYOCKWMi/k5ILXqyp+11UQL8/ 7TQeXPR8ci3A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="305366608" 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:39 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Leif Lindholm , Ard Biesheuvel Subject: [edk2-devel] [PATCH 09/18] ArmPkg: Remove All UGA Support Date: Fri, 8 May 2020 16:38:15 +0800 Message-Id: <20200508083824.1785-10-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: G4JeO04J2OHsA2LJbPVt7GNOx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588927131; bh=oB/rFl359Y4hKE8e9oVIKSZX7cVbqWcI+z/m9MxW4EQ=; h=Cc:Date:From:Reply-To:Subject:To; b=ANfNSI6gzRa/cx2ZvYm/VMLhcVvlmN87X+jWExQlk7xID8Dki+rWr+hbi5Sdq5/JLfk wW4iKU2NNRa5tao0gZMJ0Lbocp55ynQoLIcNomi7kchO/oVeCH1PMkTt/UlsGg56JKHrb QtTgyapmy9eFZU7p5O+j+Zldn//6/fFmVs4= 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 All UGA Support in ArmPkg. Cc: Leif Lindholm Cc: Ard Biesheuvel Signed-off-by: Guomin Jiang --- ArmPkg/Library/PlatformBootManagerLib/PlatformBm.h | 2 +- .../Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.h b/ArmPkg/Li= brary/PlatformBootManagerLib/PlatformBm.h index 0bb3645ddc47..fa2f05cacb48 100644 --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.h +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.h @@ -43,7 +43,7 @@ EnableQuietBoot ( Simple Text Out screens will now be synced up with all non video output devices =20 - @retval EFI_SUCCESS UGA devices are back in text mode and synced up. + @retval EFI_SUCCESS Devices are back in text mode and synced up. **/ EFI_STATUS DisableQuietBoot ( diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.i= nf b/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index 87c9b1150c54..4cdeed132d9a 100644 --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -51,9 +51,6 @@ [LibraryClasses] UefiLib UefiRuntimeServicesTableLib =20 -[FeaturePcd] - gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport - [FixedPcd] gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate --=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 (#58856): https://edk2.groups.io/g/devel/message/58856 Mute This Topic: https://groups.io/mt/74068789/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- From nobody Sun May 5 01:01:08 2024 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+58857+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+58857+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588927133; cv=none; d=zohomail.com; s=zohoarc; b=A/WiQdsD7JNBklN7Daoc68JaBNCpsOU85F4+fzPkb0A5dA90g61DO+wQWNGOdhukND0uxcGJw1lN+eRQIjicysgBUkcWUIIkkRfGD1yhZTuwedjoq5op4ovF+tcObWHgGSYrga/gAJ/Ub4c6qGPiRpXR0U7bb23aYR+J1SYpK1U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588927133; 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=aJcn+qqrOBmTHgYsJyW77snxRbhlH1oUGYiVaISHLm4=; b=XDufWDofVp2Eisw6w31Ud9oHGTsyGzJO+Xaeqh7bLx7pqIU6L5dq2XqkHe83ZVsXrK8CR9yt/EhS6xSDMzwntLf+fxw6M+BRjHzUH8RSPyhNnxnjAuFu7RXmc7qmbAhFoDABQgK/OScux+TznEjBkYsAZbK7txwXH2T86iOnkQk= 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+58857+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 1588927133171560.0842354060306; Fri, 8 May 2020 01:38:53 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 7J0lYY1788612xF2cNMWwrog; Fri, 08 May 2020 01:38:52 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web12.6878.1588927126653624329 for ; Fri, 08 May 2020 01:38:49 -0700 IronPort-SDR: ILrDU6z1pqFYV4QNHLwxmLWEjI56mYeWiCE+uEFdWJrep1yI+3XMVby0m5UG0LprILORREllqL MF70UeivV8EQ== 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:43 -0700 IronPort-SDR: x76TBK0T8/nUl5HWXFjzp8oFagaCth7AdJ0j9CHLenyiUCykjmdbKmTMwDI03mfE8/AVcK0jAC XujlWx0wLPfQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="305366611" 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:41 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Laszlo Ersek , Ard Biesheuvel , Leif Lindholm Subject: [edk2-devel] [PATCH 10/18] ArmVirtPkg: Remove All UGA Support Date: Fri, 8 May 2020 16:38:16 +0800 Message-Id: <20200508083824.1785-11-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: qNNUoBUOnQfNuUcEgYuWdLSwx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588927132; bh=DWsEhwTjERgwURSV5g29cBfwiFfiBzGRFeOrl3kBVrQ=; h=Cc:Date:From:Reply-To:Subject:To; b=QV+1uOu212QbZpl4OqrBGWL78BvAkpDasvnhKgBOEytwreSQxAOITjm0W7dQJdi2301 A5oOd2QExnZ7hk+1hhaVXsEoVPW6JIs++VbkN4f6ak6+INk4MXGNpy9TCYyEZL46XXkZ/ hv0KNbHogh1HxDe/YW8OQ+zG62yj/efK8gE= 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 All UGA Support in ArmVirtPkg Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Leif Lindholm Signed-off-by: Guomin Jiang --- ArmVirtPkg/ArmVirtQemu.dsc | 1 - ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 - 2 files changed, 2 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 3f649c91d8d6..4c40bf9e08cf 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -118,7 +118,6 @@ [PcdsFeatureFlag.common] ## If TRUE, Graphics Output Protocol will be installed on virtual handle= created by ConsplitterDxe. # It could be set FALSE to save size. gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE =20 gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE =20 diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKerne= l.dsc index 2a6fd6bc06be..46f01a934b69 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -105,7 +105,6 @@ [PcdsFeatureFlag.common] ## If TRUE, Graphics Output Protocol will be installed on virtual handle= created by ConsplitterDxe. # It could be set FALSE to save size. gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE =20 gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE =20 --=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 (#58857): https://edk2.groups.io/g/devel/message/58857 Mute This Topic: https://groups.io/mt/74068790/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- From nobody Sun May 5 01:01:08 2024 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+58854+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+58854+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588927131; cv=none; d=zohomail.com; s=zohoarc; b=SI/0/Km0lJ/hUdH3sPTL2TSNDO4aFHs1CDVDp7TZhoinuRH6AP9fIfyms68roKhr09dKXC80mv8kkRh5Sg+FMt7XneqJPbCnoD7+E9+/UK1lfFyIIpBe2RF/CVr+T51YShoKbx88hmnYoVk9rGJImrGjmPpEMO/q+6NVO9zvhjU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588927131; 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=9lyz+L2DXCq5ViGajpHhjtsdRAD3tCBNzl+oqV1BbSw=; b=e6w65RfGjgR2CHO8juSBZ4n+mx/VVEAuKYyuQWD0BdHxT8paYcfCwDmgvO4UgmvjnaccvMFgFhZc9l38IIm2Au+LUgsE8rWZiz7KjxATbX0K8f5GZB7Cf7uj/8liHXP+kbtNpR5DQsDmvJtLMPL0fKmIak7iZPZC9HvVIa6/E7w= 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+58854+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 1588927131885517.6059710780848; Fri, 8 May 2020 01:38:51 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id q68CYY1788612x5PrBUlfbzX; Fri, 08 May 2020 01:38:51 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web12.6878.1588927126653624329 for ; Fri, 08 May 2020 01:38:49 -0700 IronPort-SDR: bz6kfng31E5fiu5yd0ggtYxztajfF8Sv5NMsyqh0p5E0jXoI9qzlE4djR8t7nPtteADlIKKkNe v/dKxVRzd0wg== 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:44 -0700 IronPort-SDR: YNRLYpCWgyBF7Pn5XcSJjb7wNG14cxY62iys1j38+3WnnEQM5P9x3X633rCqYI78BLARNjlOnO Z0yu/hgwmeiA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="305366621" 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:43 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Michael D Kinney , Liming Gao Subject: [edk2-devel] [PATCH 11/18] MdePkg: Remove All UGA Support Date: Fri, 8 May 2020 16:38:17 +0800 Message-Id: <20200508083824.1785-12-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: brQLLntCRwJSjB20xg5r9hx8x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588927131; bh=p16qnpWNNbj0MQW3Yggxhgjt1JcZ1VYkYxpGb5ABjik=; h=Cc:Date:From:Reply-To:Subject:To; b=fwbuqdDSc6LMSdQuPfQTOHmBiWgBA8JvbKYJFsNQm3e8R/OAGHR2p+kgho/rjdHMEAw M6mUsadgXrAeI+zY39C53uVb8lA3M57B9EBrzjKrhbPiuqJFQVnU7wu8lYvxgTITFT5mE 9zQqXeUC/Sqv6zbc/yq9TatlObdeBMsHIU4= 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 All UGA Support in MdePkg. Cc: Michael D Kinney Cc: Liming Gao Signed-off-by: Guomin Jiang --- MdePkg/Include/Protocol/UgaDraw.h | 160 ------------------- MdePkg/Include/Protocol/UgaIo.h | 191 ----------------------- MdePkg/Library/UefiLib/UefiLib.inf | 2 - MdePkg/Library/UefiLib/UefiLibInternal.h | 1 - MdePkg/Library/UefiLib/UefiLibPrint.c | 88 ----------- MdePkg/MdePkg.dec | 12 -- MdePkg/MdePkg.dsc | 3 - MdePkg/MdePkg.uni | 6 - 8 files changed, 463 deletions(-) delete mode 100644 MdePkg/Include/Protocol/UgaDraw.h delete mode 100644 MdePkg/Include/Protocol/UgaIo.h diff --git a/MdePkg/Include/Protocol/UgaDraw.h b/MdePkg/Include/Protocol/Ug= aDraw.h deleted file mode 100644 index 3d423be052c5..000000000000 --- a/MdePkg/Include/Protocol/UgaDraw.h +++ /dev/null @@ -1,160 +0,0 @@ -/** @file - UGA Draw protocol from the EFI 1.10 specification. - - Abstraction of a very simple graphics device. - - Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
- SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#ifndef __UGA_DRAW_H__ -#define __UGA_DRAW_H__ - - -#define EFI_UGA_DRAW_PROTOCOL_GUID \ - { \ - 0x982c298b, 0xf4fa, 0x41cb, {0xb8, 0x38, 0x77, 0xaa, 0x68, 0x8f, 0xb8,= 0x39 } \ - } - -typedef struct _EFI_UGA_DRAW_PROTOCOL EFI_UGA_DRAW_PROTOCOL; - -/** - Return the current video mode information. - - @param This The EFI_UGA_DRAW_PROTOCOL instance. - @param HorizontalResolution The size of video screen in pixels in the = X dimension. - @param VerticalResolution The size of video screen in pixels in the = Y dimension. - @param ColorDepth Number of bits per pixel, currently define= d to be 32. - @param RefreshRate The refresh rate of the monitor in Hertz. - - @retval EFI_SUCCESS Mode information returned. - @retval EFI_NOT_STARTED Video display is not initialized. Call Set= Mode () - @retval EFI_INVALID_PARAMETER One of the input args was NULL. - -**/ -typedef -EFI_STATUS -(EFIAPI *EFI_UGA_DRAW_PROTOCOL_GET_MODE)( - IN EFI_UGA_DRAW_PROTOCOL *This, - OUT UINT32 *HorizontalResolution, - OUT UINT32 *VerticalResolution, - OUT UINT32 *ColorDepth, - OUT UINT32 *RefreshRate - ); - -/** - Set the current video mode information. - - @param This The EFI_UGA_DRAW_PROTOCOL instance. - @param HorizontalResolution The size of video screen in pixels in the X= dimension. - @param VerticalResolution The size of video screen in pixels in the Y= dimension. - @param ColorDepth Number of bits per pixel, currently defined= to be 32. - @param RefreshRate The refresh rate of the monitor in Hertz. - - @retval EFI_SUCCESS Mode information returned. - @retval EFI_NOT_STARTED Video display is not initialized. Call SetM= ode () - -**/ -typedef -EFI_STATUS -(EFIAPI *EFI_UGA_DRAW_PROTOCOL_SET_MODE)( - IN EFI_UGA_DRAW_PROTOCOL *This, - IN UINT32 HorizontalResolution, - IN UINT32 VerticalResolution, - IN UINT32 ColorDepth, - IN UINT32 RefreshRate - ); - -typedef struct { - UINT8 Blue; - UINT8 Green; - UINT8 Red; - UINT8 Reserved; -} EFI_UGA_PIXEL; - -typedef union { - EFI_UGA_PIXEL Pixel; - UINT32 Raw; -} EFI_UGA_PIXEL_UNION; - -/// -/// Enumration value for actions of Blt operations. -/// -typedef enum { - EfiUgaVideoFill, ///< Write data from the BltBuffer pixel (Sou= rceX, SourceY) - ///< directly to every pixel of the video disp= lay rectangle - ///< (DestinationX, DestinationY) (Destination= X + Width, DestinationY + Height). - ///< Only one pixel will be used from the BltB= uffer. Delta is NOT used. - - EfiUgaVideoToBltBuffer, ///< Read data from the video display rectangle - ///< (SourceX, SourceY) (SourceX + Width, Sour= ceY + Height) and place it in - ///< the BltBuffer rectangle (DestinationX, De= stinationY ) - ///< (DestinationX + Width, DestinationY + Hei= ght). If DestinationX or - ///< DestinationY is not zero then Delta must = be set to the length in bytes - ///< of a row in the BltBuffer. - - EfiUgaBltBufferToVideo, ///< Write data from the BltBuffer rectangle - ///< (SourceX, SourceY) (SourceX + Width, Sour= ceY + Height) directly to the - ///< video display rectangle (DestinationX, De= stinationY) - ///< (DestinationX + Width, DestinationY + Hei= ght). If SourceX or SourceY is - ///< not zero then Delta must be set to the le= ngth in bytes of a row in the - ///< BltBuffer. - - EfiUgaVideoToVideo, ///< Copy from the video display rectangle (So= urceX, SourceY) - ///< (SourceX + Width, SourceY + Height) .to t= he video display rectangle - ///< (DestinationX, DestinationY) (Destination= X + Width, DestinationY + Height). - ///< The BltBuffer and Delta are not used in = this mode. - - EfiUgaBltMax ///< Maxmimum value for enumration value of Bl= t operation. If a Blt operation - ///< larger or equal to this enumration value,= it is invalid. -} EFI_UGA_BLT_OPERATION; - -/** - Blt a rectangle of pixels on the graphics screen. - - @param[in] This - Protocol instance pointer. - @param[in] BltBuffer - Buffer containing data to blit into video b= uffer. This - buffer has a size of Width*Height*sizeof(EF= I_UGA_PIXEL) - @param[in] BltOperation - Operation to perform on BlitBuffer and vide= o memory - @param[in] SourceX - X coordinate of source for the BltBuffer. - @param[in] SourceY - Y coordinate of source for the BltBuffer. - @param[in] DestinationX - X coordinate of destination for the BltBuff= er. - @param[in] DestinationY - Y coordinate of destination for the BltBuff= er. - @param[in] Width - Width of rectangle in BltBuffer in pixels. - @param[in] Height - Hight of rectangle in BltBuffer in pixels. - @param[in] Delta - OPTIONAL - - @retval EFI_SUCCESS - The Blt operation completed. - @retval EFI_INVALID_PARAMETER - BltOperation is not valid. - @retval EFI_DEVICE_ERROR - A hardware error occured writting to t= he video buffer. - -**/ -typedef -EFI_STATUS -(EFIAPI *EFI_UGA_DRAW_PROTOCOL_BLT)( - IN EFI_UGA_DRAW_PROTOCOL * This, - IN EFI_UGA_PIXEL * BltBuffer, OPTIONAL - IN EFI_UGA_BLT_OPERATION BltOperation, - IN UINTN SourceX, - IN UINTN SourceY, - IN UINTN DestinationX, - IN UINTN DestinationY, - IN UINTN Width, - IN UINTN Height, - IN UINTN Delta OPTIONAL - ); - -/// -/// This protocol provides a basic abstraction to set video modes and -/// copy pixels to and from the graphics controller's frame buffer. -/// -struct _EFI_UGA_DRAW_PROTOCOL { - EFI_UGA_DRAW_PROTOCOL_GET_MODE GetMode; - EFI_UGA_DRAW_PROTOCOL_SET_MODE SetMode; - EFI_UGA_DRAW_PROTOCOL_BLT Blt; -}; - -extern EFI_GUID gEfiUgaDrawProtocolGuid; - -#endif diff --git a/MdePkg/Include/Protocol/UgaIo.h b/MdePkg/Include/Protocol/UgaI= o.h deleted file mode 100644 index 67a6abd226c9..000000000000 --- a/MdePkg/Include/Protocol/UgaIo.h +++ /dev/null @@ -1,191 +0,0 @@ -/** @file - UGA IO protocol from the EFI 1.10 specification. - - Abstraction of a very simple graphics device. - - Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
- SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#ifndef __UGA_IO_H__ -#define __UGA_IO_H__ - -#define EFI_UGA_IO_PROTOCOL_GUID \ - { 0x61a4d49e, 0x6f68, 0x4f1b, { 0xb9, 0x22, 0xa8, 0x6e, 0xed, 0xb, 0x7, = 0xa2 } } - -typedef struct _EFI_UGA_IO_PROTOCOL EFI_UGA_IO_PROTOCOL; - -typedef UINT32 UGA_STATUS; - -typedef enum { - UgaDtParentBus =3D 1, - UgaDtGraphicsController, - UgaDtOutputController, - UgaDtOutputPort, - UgaDtOther -} UGA_DEVICE_TYPE, *PUGA_DEVICE_TYPE; - -typedef UINT32 UGA_DEVICE_ID, *PUGA_DEVICE_ID; - -typedef struct { - UGA_DEVICE_TYPE deviceType; - UGA_DEVICE_ID deviceId; - UINT32 ui32DeviceContextSize; - UINT32 ui32SharedContextSize; -} UGA_DEVICE_DATA, *PUGA_DEVICE_DATA; - -typedef struct _UGA_DEVICE { - VOID *pvDeviceContext; - VOID *pvSharedContext; - VOID *pvRunTimeContext; - struct _UGA_DEVICE *pParentDevice; - VOID *pvBusIoServices; - VOID *pvStdIoServices; - UGA_DEVICE_DATA deviceData; -} UGA_DEVICE, *PUGA_DEVICE; - -typedef enum { - UgaIoGetVersion =3D 1, - UgaIoGetChildDevice, - UgaIoStartDevice, - UgaIoStopDevice, - UgaIoFlushDevice, - UgaIoResetDevice, - UgaIoGetDeviceState, - UgaIoSetDeviceState, - UgaIoSetPowerState, - UgaIoGetMemoryConfiguration, - UgaIoSetVideoMode, - UgaIoCopyRectangle, - UgaIoGetEdidSegment, - UgaIoDeviceChannelOpen, - UgaIoDeviceChannelClose, - UgaIoDeviceChannelRead, - UgaIoDeviceChannelWrite, - UgaIoGetPersistentDataSize, - UgaIoGetPersistentData, - UgaIoSetPersistentData, - UgaIoGetDevicePropertySize, - UgaIoGetDeviceProperty, - UgaIoBtPrivateInterface -} UGA_IO_REQUEST_CODE, *PUGA_IO_REQUEST_CODE; - -typedef struct { - IN UGA_IO_REQUEST_CODE ioRequestCode; - IN VOID *pvInBuffer; - IN UINT64 ui64InBufferSize; - OUT VOID *pvOutBuffer; - IN UINT64 ui64OutBufferSize; - OUT UINT64 ui64BytesReturned; -} UGA_IO_REQUEST, *PUGA_IO_REQUEST; - - -/** - Dynamically allocate storage for a child UGA_DEVICE. - - @param[in] This The EFI_UGA_IO_PROTOCOL instance. - @param[in] ParentDevice ParentDevice specifies a pointer to the p= arent device of Device. - @param[in] DeviceData A pointer to UGA_DEVICE_DATA returned fro= m a call to DispatchService() - with a UGA_DEVICE of Parent and an IoRequ= est of type UgaIoGetChildDevice. - @param[in] RunTimeContext Context to associate with Device. - @param[out] Device The Device returns a dynamically allocate= d child UGA_DEVICE object - for ParentDevice. The caller is responsib= le for deleting Device. - - - @retval EFI_SUCCESS Device was returned. - @retval EFI_INVALID_PARAMETER One of the arguments was not valid. - @retval EFI_DEVICE_ERROR The device had an error and could not com= plete the request. - -**/ -typedef -EFI_STATUS -(EFIAPI *EFI_UGA_IO_PROTOCOL_CREATE_DEVICE)( - IN EFI_UGA_IO_PROTOCOL *This, - IN UGA_DEVICE *ParentDevice, - IN UGA_DEVICE_DATA *DeviceData, - IN VOID *RunTimeContext, - OUT UGA_DEVICE **Device - ); - - -/** - Delete a dynamically allocated child UGA_DEVICE object that was allocate= d via CreateDevice(). - - @param[in] This The EFI_UGA_IO_PROTOCOL instance. Type EF= I_UGA_IO_PROTOCOL is - defined in Section 10.7. - @param[in] Device The Device points to a UGA_DEVICE object = that was dynamically - allocated via a CreateDevice() call. - - - @retval EFI_SUCCESS Device was returned. - @retval EFI_INVALID_PARAMETER The Device was not allocated via CreateDe= vice(). - -**/ -typedef -EFI_STATUS -(EFIAPI *EFI_UGA_IO_PROTOCOL_DELETE_DEVICE)( - IN EFI_UGA_IO_PROTOCOL * This, - IN UGA_DEVICE * Device - ); - -/** - This is the main UGA service dispatch routine for all UGA_IO_REQUEST s. - - @param pDevice pDevice specifies a pointer to a device object associated= with a - device enumerated by a pIoRequest->ioRequestCode of type - UgaIoGetChildDevice. The root device for the EFI_UGA_IO_P= ROTOCOL - is represented by pDevice being set to NULL. - - @param pIoRequest - pIoRequest points to a caller allocated buffer that conta= ins data - defined by pIoRequest->ioRequestCode. See Related Definit= ions for - a definition of UGA_IO_REQUEST_CODE s and their associate= d data - structures. - - @return UGA_STATUS - -**/ -typedef UGA_STATUS -(EFIAPI *PUGA_FW_SERVICE_DISPATCH)( - IN PUGA_DEVICE pDevice, - IN OUT PUGA_IO_REQUEST pIoRequest - ); - -/// -/// Provides a basic abstraction to send I/O requests to the graphics devi= ce and any of its children. -/// -struct _EFI_UGA_IO_PROTOCOL { - EFI_UGA_IO_PROTOCOL_CREATE_DEVICE CreateDevice; - EFI_UGA_IO_PROTOCOL_DELETE_DEVICE DeleteDevice; - PUGA_FW_SERVICE_DISPATCH DispatchService; -}; - -extern EFI_GUID gEfiUgaIoProtocolGuid; - -// -// Data structure that is stored in the EFI Configuration Table with the -// EFI_UGA_IO_PROTOCOL_GUID. The option ROMs listed in this table may have -// EBC UGA drivers. -// -typedef struct { - UINT32 Version; - UINT32 HeaderSize; - UINT32 SizeOfEntries; - UINT32 NumberOfEntries; -} EFI_DRIVER_OS_HANDOFF_HEADER; - -typedef enum { - EfiUgaDriverFromPciRom, - EfiUgaDriverFromSystem, - EfiDriverHandoffMax -} EFI_DRIVER_HANOFF_ENUM; - -typedef struct { - EFI_DRIVER_HANOFF_ENUM Type; - EFI_DEVICE_PATH_PROTOCOL *DevicePath; - VOID *PciRomImage; - UINT64 PciRomSize; -} EFI_DRIVER_OS_HANDOFF; - -#endif diff --git a/MdePkg/Library/UefiLib/UefiLib.inf b/MdePkg/Library/UefiLib/Ue= fiLib.inf index 01ed92092da2..9f3863787833 100644 --- a/MdePkg/Library/UefiLib/UefiLib.inf +++ b/MdePkg/Library/UefiLib/UefiLib.inf @@ -67,7 +67,6 @@ [Protocols] gEfiGraphicsOutputProtocolGuid ## SOMETIMES_CONSUMES gEfiHiiFontProtocolGuid ## SOMETIMES_CONSUMES gEfiSimpleFileSystemProtocolGuid ## SOMETIMES_CONSUMES - gEfiUgaDrawProtocolGuid | gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport = ## SOMETIMES_CONSUMES # Consumes if gEfiGraphicsOutputProto= colGuid uninstalled gEfiComponentNameProtocolGuid | NOT gEfiMdePkgTokenSpaceGuid.PcdCompone= ntNameDisable ## SOMETIMES_PRODUCES # User chooses to produce it gEfiComponentName2ProtocolGuid | NOT gEfiMdePkgTokenSpaceGuid.PcdCompone= ntName2Disable ## SOMETIMES_PRODUCES # User chooses to produce it gEfiDriverConfigurationProtocolGuid ## SOMETI= MES_PRODUCES # User chooses to produce it @@ -84,5 +83,4 @@ [FeaturePcd] gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable ## CONSUMES gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable ## CONSUMES gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable ## CONSUMES - gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport ## CONSUMES =20 diff --git a/MdePkg/Library/UefiLib/UefiLibInternal.h b/MdePkg/Library/Uefi= Lib/UefiLibInternal.h index 60b5297c7516..ed6b69030361 100644 --- a/MdePkg/Library/UefiLib/UefiLibInternal.h +++ b/MdePkg/Library/UefiLib/UefiLibInternal.h @@ -19,7 +19,6 @@ #include #include #include -#include #include =20 #include diff --git a/MdePkg/Library/UefiLib/UefiLibPrint.c b/MdePkg/Library/UefiLib= /UefiLibPrint.c index ae3a94eb0ca0..90dde0778e81 100644 --- a/MdePkg/Library/UefiLib/UefiLibPrint.c +++ b/MdePkg/Library/UefiLib/UefiLibPrint.c @@ -344,20 +344,14 @@ InternalPrintGraphic ( EFI_STATUS Status; UINT32 HorizontalResolution; UINT32 VerticalResolution; - UINT32 ColorDepth; - UINT32 RefreshRate; EFI_HII_FONT_PROTOCOL *HiiFont; EFI_IMAGE_OUTPUT *Blt; EFI_FONT_DISPLAY_INFO FontInfo; EFI_HII_ROW_INFO *RowInfoArray; UINTN RowInfoArraySize; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *Sto; EFI_HANDLE ConsoleHandle; - UINTN Width; - UINTN Height; - UINTN Delta; =20 HorizontalResolution =3D 0; VerticalResolution =3D 0; @@ -373,20 +367,6 @@ InternalPrintGraphic ( &gEfiGraphicsOutputProtocolGuid, (VOID **) &GraphicsOutput ); - - UgaDraw =3D NULL; - if (EFI_ERROR (Status) && FeaturePcdGet (PcdUgaConsumeSupport)) { - // - // If no GOP available, try to open UGA Draw protocol if supported. - // - GraphicsOutput =3D NULL; - - Status =3D gBS->HandleProtocol ( - ConsoleHandle, - &gEfiUgaDrawProtocolGuid, - (VOID **) &UgaDraw - ); - } if (EFI_ERROR (Status)) { goto Error; } @@ -404,8 +384,6 @@ InternalPrintGraphic ( if (GraphicsOutput !=3D NULL) { HorizontalResolution =3D GraphicsOutput->Mode->Info->HorizontalResolut= ion; VerticalResolution =3D GraphicsOutput->Mode->Info->VerticalResolution; - } else if (UgaDraw !=3D NULL && FeaturePcdGet (PcdUgaConsumeSupport)) { - UgaDraw->GetMode (UgaDraw, &HorizontalResolution, &VerticalResolution,= &ColorDepth, &RefreshRate); } else { goto Error; } @@ -464,72 +442,6 @@ InternalPrintGraphic ( if (EFI_ERROR (Status)) { goto Error; } - - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - ASSERT (UgaDraw!=3D NULL); - - // - // Ensure Width * Height * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) does= n't overflow. - // - if (Blt->Width > DivU64x32 (MAX_UINTN, Blt->Height * sizeof (EFI_GRAPH= ICS_OUTPUT_BLT_PIXEL))) { - goto Error; - } - - Blt->Image.Bitmap =3D AllocateZeroPool ((UINT32) Blt->Width * Blt->Hei= ght * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); - ASSERT (Blt->Image.Bitmap !=3D NULL); - - // - // StringToImage only support blt'ing image to device using GOP proto= col. If GOP is not supported in this platform, - // we ask StringToImage to print the string to blt buffer, then blt t= o device using UgaDraw. - // - Status =3D HiiFont->StringToImage ( - HiiFont, - EFI_HII_IGNORE_IF_NO_GLYPH | EFI_HII_OUT_FLAG_CLI= P | - EFI_HII_OUT_FLAG_CLIP_CLEAN_X | EFI_HII_OUT_FLAG_= CLIP_CLEAN_Y | - EFI_HII_IGNORE_LINE_BREAK, - Buffer, - &FontInfo, - &Blt, - PointX, - PointY, - &RowInfoArray, - &RowInfoArraySize, - NULL - ); - - if (!EFI_ERROR (Status)) { - ASSERT (RowInfoArray !=3D NULL); - // - // Explicit Line break characters are ignored, so the updated parame= ter RowInfoArraySize by StringToImage will - // always be 1 or 0 (if there is no valid Unicode Char can be printe= d). ASSERT here to make sure. - // - ASSERT (RowInfoArraySize <=3D 1); - - if (RowInfoArraySize !=3D 0) { - Width =3D RowInfoArray[0].LineWidth; - Height =3D RowInfoArray[0].LineHeight; - Delta =3D Blt->Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL); - } else { - Width =3D 0; - Height =3D 0; - Delta =3D 0; - } - Status =3D UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) Blt->Image.Bitmap, - EfiUgaBltBufferToVideo, - PointX, - PointY, - PointX, - PointY, - Width, - Height, - Delta - ); - } else { - goto Error; - } - FreePool (Blt->Image.Bitmap); } else { goto Error; } diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec index 0b9c4bc40ace..5d19b1182c85 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -1374,12 +1374,6 @@ [Protocols] ## Include/Protocol/EdidOverride.h gEfiEdidOverrideProtocolGuid =3D { 0x48ECB431, 0xFB72, 0x45C0, { 0xA9,= 0x22, 0xF4, 0x58, 0xFE, 0x04, 0x0B, 0xD5 }} =20 - ## Include/Protocol/UgaIo.h - gEfiUgaIoProtocolGuid =3D { 0x61A4D49E, 0x6F68, 0x4F1B, { 0xB9,= 0x22, 0xA8, 0x6E, 0xED, 0x0B, 0x07, 0xA2 }} - - ## Include/Protocol/UgaDraw.h - gEfiUgaDrawProtocolGuid =3D { 0x982C298B, 0xF4FA, 0x41CB, { 0xB8,= 0x38, 0x77, 0xAA, 0x68, 0x8F, 0xB8, 0x39 }} - ## Include/Protocol/LoadedImage.h gEfiLoadedImageProtocolGuid =3D { 0x5B1B31A1, 0x9562, 0x11D2, { 0x8E,= 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }} =20 @@ -1857,12 +1851,6 @@ [PcdsFeatureFlag] # @Prompt Deprecate Global Variable LangCodes. gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangDeprecate|FALSE|BOOLE= AN|0x00000012 =20 - ## Indicates if UGA Draw Protocol is still consumed.

- # TRUE - Consume UGA Draw protocol.
- # FALSE - Does not consume UGA Draw protocol.
- # @Prompt Consume UGA Draw Protocol. - gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport|TRUE|BOOLEAN|0x00000027 - ## Indicates if a check will be made to see if a specified node is a mem= ber of linked list # in the following BaseLib functions: GetNextNode(), IsNull(), IsNodeAt= End(), SwapListEntries().

# TRUE - Verify a specified node is a member of linked list.
diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc index 6cd38e7ec3c9..3c2420cba29c 100644 --- a/MdePkg/MdePkg.dsc +++ b/MdePkg/MdePkg.dsc @@ -21,9 +21,6 @@ [Defines] =20 !include UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc =20 -[PcdsFeatureFlag] - gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport|TRUE - [PcdsFixedAtBuild] gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0f gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000 diff --git a/MdePkg/MdePkg.uni b/MdePkg/MdePkg.uni index 5c1fa24065c7..7b00a396848c 100644 --- a/MdePkg/MdePkg.uni +++ b/MdePkg/MdePkg.uni @@ -373,12 +373,6 @@ = "TRUE - Deprecate global variable LangCodes.
\n" = "FALSE - Does not deprecate global variable LangCodes.=
" =20 -#string STR_gEfiMdePkgTokenSpaceGuid_PcdUgaConsumeSupport_PROMPT #languag= e en-US "Consume UGA Draw Protocol" - -#string STR_gEfiMdePkgTokenSpaceGuid_PcdUgaConsumeSupport_HELP #language = en-US "Indicates if UGA Draw Protocol is still consumed.

\n" - = "TRUE - Consume UGA Draw protocol.
\n" - = "FALSE - Does not consume UGA Draw protocol.
" - #string STR_gEfiMdePkgTokenSpaceGuid_PcdVerifyNodeInList_PROMPT #language= en-US "Verify Node In List" =20 #string STR_gEfiMdePkgTokenSpaceGuid_PcdVerifyNodeInList_HELP #language e= n-US "Indicates if a check will be made to see if a specified node is a mem= ber of linked list in the following BaseLib functions: GetNextNode(), IsNul= l(), IsNodeAtEnd(), SwapListEntries().

\n" --=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 (#58854): https://edk2.groups.io/g/devel/message/58854 Mute This Topic: https://groups.io/mt/74068787/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- From nobody Sun May 5 01:01:08 2024 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+58858+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+58858+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588927133; cv=none; d=zohomail.com; s=zohoarc; b=XNgBkcCbrIVW3RosUk7FTNo3/mPdWXJoaeupX7I+E711oxV7FCiWPaTG3HcsP9PHlgcrIQ/jGAEzL1RBLdp4xYoX8waDeKUEZATKVrhO6bGiIFp0C9st70dIt8wH+DkmFH7iYjR0PwCDYB8bqkMGchv4PjIVKsIesafi703VZOk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588927133; 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=WLHj63nVaZSppYOV6vHtwGLy9UqshNj92L10LCC5PU8=; b=h+zBAzKNAZsOHaM02Llkpla21DwZmx0axWFGGVWzQoEBpLd78RCoWSEcNAr8/RZ56LfFGIUaNU3mW7YLcP4UCzI2Y8Tn2POxd7pF5CP6jU81BE/Fn2Mhtt+qNHlaI2j6pD78o4/Ado1nz1eadn/Fz24irDGpRa77QrLbH44LGNs= 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+58858+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 1588927133598201.36613024875908; Fri, 8 May 2020 01:38:53 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 9bZuYY1788612xaceRZQvnEI; Fri, 08 May 2020 01:38:53 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web12.6879.1588927128006250571 for ; Fri, 08 May 2020 01:38:49 -0700 IronPort-SDR: sca1K9Ck5WHCDJT+bLcyqhYGIgLCOkgP47a1LazkChjfcUROnS++wjwUxlQ0UoQNbenj72KBBL P82gnCtwnAGA== 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:46 -0700 IronPort-SDR: MyyWBNJifGi0ir+PnZlZATSuXkjqm5eI4pUd59pJyKF6+FM23ltEog8hRlOzQtK36uJCBcG9FR 9ikRDf0WcaBg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="305366631" 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:44 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Jian J Wang , Hao A Wu Subject: [edk2-devel] [PATCH 12/18] MdeModulePkg: Remove All UGA Support Date: Fri, 8 May 2020 16:38:18 +0800 Message-Id: <20200508083824.1785-13-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: trbhfmiNqGIvBnqJeXQn99ylx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588927133; bh=kqrvwTOPL6u1Xrq9HIPDWK8KaoneKkOuRFx40NEs1P4=; h=Cc:Date:From:Reply-To:Subject:To; b=b+RrLLCbluhKj6p68aEEra4jYSa+O2vYhda7djzR/ZDDjlenpzlh3O2MMcsTplTFYoQ j3t46v/MJPnwwJf/IUWiCKJzsaxlMSfvgDFFm4sxYzmucKeV5fJ5e0EDQ0gbJuRMuESfZ /UOw6l0UtgaJ31S29nAAN3SeqSdaMfY4tlQ= 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 Pcds related to UGA. Cc: Jian J Wang Cc: Hao A Wu Signed-off-by: Guomin Jiang --- MdeModulePkg/MdeModulePkg.dec | 7 ------- MdeModulePkg/MdeModulePkg.uni | 6 ------ 2 files changed, 13 deletions(-) diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 4f44af694862..a31f0a85883d 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -691,13 +691,6 @@ [PcdsFeatureFlag] # @Prompt Enable ConOut GOP support. gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE|BOOLEAN|0x000100= 42 =20 - ## Indicates if UGA Draw Protocol will be installed on virtual handle cr= eated by ConsplitterDxe. - # It could be set FALSE to save size.

- # TRUE - Installs UGA Draw Protocol on virtual handle created by Cons= plitterDxe.
- # FALSE - Does not install UGA Draw Protocol on virtual handle created= by ConsplitterDxe.
- # @Prompt Enable ConOut UGA support. - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|TRUE|BOOLEAN|0x000100= 43 - ## Indicates PeiCore will first search TE section from the PEIM to load = the image, or PE32 section, when PeiCore dispatches a PEI module. # This PCD is used to tune PEI phase performance to reduce the search i= mage time. # It can be set according to the generated image section type.

diff --git a/MdeModulePkg/MdeModulePkg.uni b/MdeModulePkg/MdeModulePkg.uni index 2007e0596c4f..0cfcb0039d7f 100644 --- a/MdeModulePkg/MdeModulePkg.uni +++ b/MdeModulePkg/MdeModulePkg.uni @@ -696,12 +696,6 @@ = "TRUE - Installs Graphics Output Protocol on virtual handle cre= ated by ConsplitterDxe.
\n" = "FALSE - Does not install Graphics Output Protocol on virtual ha= ndle created by ConsplitterDxe.
" =20 -#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdConOutUgaSupport_PROMPT #la= nguage en-US "Enable ConOut UGA support" - -#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdConOutUgaSupport_HELP #lang= uage en-US "Indicates if UGA Draw Protocol will be installed on virtual han= dle created by ConsplitterDxe. It could be set FALSE to save size.

\= n" - = "TRUE - Installs UGA Draw Protocol on virtual handle created by= ConsplitterDxe.
\n" - = "FALSE - Does not install UGA Draw Protocol on virtual handle cr= eated by ConsplitterDxe.
" - #string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdPeiCoreImageLoaderSearchTeSe= ctionFirst_PROMPT #language en-US "PeiCore search TE section first" =20 #string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdPeiCoreImageLoaderSearchTeSe= ctionFirst_HELP #language en-US "Indicates PeiCore will first search TE se= ction from the PEIM to load the image, or PE32 section, when PeiCore dispat= ches a PEI module. This PCD is used to tune PEI phase performance to reduce= the search image time. It can be set according to the generated image sect= ion type.

\n" --=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 (#58858): https://edk2.groups.io/g/devel/message/58858 Mute This Topic: https://groups.io/mt/74068791/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- From nobody Sun May 5 01:01:08 2024 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+58859+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+58859+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=k5WkU/yeOCJeYHDnMM503TFBEEmHucThcAOFtELBZLgl5n55tz2HEy7rUPxhc5AgDsELVRvHtuJKKedW7z24UvfyqLWDwVB1pgfpsQMLI9Xd+tUgfseZfHchgVAXte4pFF6fl/5XnlkonR0zRrApYtmvKecvOtU3hcrWBsXC6zM= 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=jADw5P5R0EIWiZbg84zOdPZ/XtnE7+dV9tMylIM2O4g=; b=YwxSC0aAjd7RfHpVki3r/6i476I+6V6jmao92HqxXbp5ByhpSTeWyx8Kfseiw/b4n6XN0nT1eCU3wYW2m041cP45yGkx7Sx9JAV0EBUIMLBrI7rGd8sWoe3hpFl//SdRhlOvr6YFdenIwt7NbcrmhzsObf20aP6a8L7IKj+WDBw= 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+58859+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 1588927134015136.41711753260063; Fri, 8 May 2020 01:38:54 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 2CWwYY1788612xuPMjHDNfWf; Fri, 08 May 2020 01:38:53 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web12.6879.1588927128006250571 for ; Fri, 08 May 2020 01:38:49 -0700 IronPort-SDR: 9ZCXpoQ+fmo4f6gKjpyEpVK1q8xRupKB76esSyYNeLpS4ayqSJSlqlK5bxW3T9h4OBeb0JulWR 6j1myMXaKZ8A== 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:47 -0700 IronPort-SDR: LD/Cj6LZa/mpTMdNEnVdq89vvfOq3S+wtsGOwp+0igGscGtJ/pbQeSULXU2LqSFmoCO2TXBQBt wcNfixNSvcpw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="305366641" 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:46 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Zhichao Gao , Ray Ni Subject: [edk2-devel] [PATCH 13/18] MdeModulePkg/ConSplitterDxe: Remove All UGA Support Date: Fri, 8 May 2020 16:38:19 +0800 Message-Id: <20200508083824.1785-14-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: kKAfiRLP3xuHlaY3N1I30y6Cx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588927133; bh=asT3oNlJcQV4hd4EEGD+VC6+pbR0axmSOPsLM4o0Uv8=; h=Cc:Date:From:Reply-To:Subject:To; b=O6Q+/6dtOXGzkg5GodOOEL985dfad/SPMC7asqhyEm7YDKrRdhDGlfu/B3hYB66e1kZ kYnrGvr7JurQn8Zn001s/IQmqtSr8T4d0qKsAUqWyfzFfKAaz9eQU5uciRyCPrXU/qufm NgJCiRhUxQjGVgFOllC98bzZWyrVHlEqMU4= 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 Avoid OVMF hang when remove UGA support. Cc: Zhichao Gao Cc: Ray Ni Signed-off-by: Guomin Jiang --- .../Universal/Console/ConSplitterDxe/ConSplitter.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/= MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c index 3fdeee4b409b..18c25956d0d9 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c @@ -3060,12 +3060,14 @@ ConSplitterTextOutAddDevice ( DeviceStatus =3D ConSplitterAddGraphicsOutputMode (Private, GraphicsOu= tput); } =20 - Status =3D GraphicsOutput->QueryMode (GraphicsOutput, GraphicsOutput->Mo= de->Mode, &SizeOfInfo, &Info); - if (EFI_ERROR (Status)) { - return Status; + if (GraphicsOutput !=3D NULL) { + Status =3D GraphicsOutput->QueryMode (GraphicsOutput, GraphicsOutput->= Mode->Mode, &SizeOfInfo, &Info); + if (EFI_ERROR (Status)) { + return Status; + } + ASSERT ( SizeOfInfo <=3D sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION)= ); + FreePool (Info); } - ASSERT ( SizeOfInfo <=3D sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION)); - FreePool (Info); =20 if (((!EFI_ERROR (DeviceStatus)) || (!EFI_ERROR (Status))) && ((Private->CurrentNumberOfGraphicsOutput) =3D=3D 1)) { --=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 (#58859): https://edk2.groups.io/g/devel/message/58859 Mute This Topic: https://groups.io/mt/74068792/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- From nobody Sun May 5 01:01:08 2024 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- From nobody Sun May 5 01:01:08 2024 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+58861+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+58861+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588927135; cv=none; d=zohomail.com; s=zohoarc; b=USPyiVo/riQoSdYC2S999LVHvhLajqzzf7EjAyDrmOhAgdNw65/mdcslwD2TH9bDqKjrAkq7DhAARSIA9SbWAQPeD31yK30k69AFtgs4wuG7+R8op8e4x1LwbbSqubd56VDwaJtUIGmqdcUVnZ5hy1Y4LqyO4461MhM/hKkQA3E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588927135; 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=yyZl3XPOhZIcDWz9TUFqEZHjVwDhf6WpHh3LcZsbkDY=; b=g1ZSxrFVR3ysagq4t7GyAe4AKt79FQJPK4949M5Sc6cG2qYlB21WpsSd5VLN4ty9woK6uon2BOxmYDPiU9079Yc65NQjRtgGVaJttjbGUspD0kao+Q4SN+BMv2eav62n2of/7rhYpE7sIo7yx/aYTpjQfk2HuqLQ8dLdr2dUM6s= 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+58861+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 1588927135104711.2819732242189; Fri, 8 May 2020 01:38:55 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ELl4YY1788612xmlgPXhlRgS; Fri, 08 May 2020 01:38:54 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web11.6710.1588927130864428592 for ; Fri, 08 May 2020 01:38:51 -0700 IronPort-SDR: Tn6oiSGxhZ/j+CYpvQUTYzspW/QM6RFLq5up18yWkCKkiNwrOcDmGAqP1jEtL76OocJXx9n6ic ITSWDAfGXpKg== 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:50 -0700 IronPort-SDR: Et3a2BHXZB2TinAgUZXLjH4tp6BxtirpF2P3UK8hyN5BZKLfVNvMCHDz3ptzxWjMTwyRfeLfxN 9dR+3MA5Qk0w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="305366663" 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:49 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [PATCH 15/18] OvmfPkg: Remove All UGA Support Date: Fri, 8 May 2020 16:38:21 +0800 Message-Id: <20200508083824.1785-16-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: u4NRw6jUjdMRIsOxPz11e8R8x1787277AA= 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=swOYEldO07i/YU4DL+MICyBJASiQwTY68gO1/68wsXE=; h=Cc:Date:From:Reply-To:Subject:To; b=NmuIEcUpUgtX7SteVfNq1+pvIWem4pS5+OL3hrB6Ga4b9v9Lk7oHvNUWWmGNL1Ijlg8 bdkQWts/S1WJ2rNaP71Tt6w/Tq38NEJdhHJmi1Y89BRtaHQZz0yj+aA8ljYEvl/g1viv3 msy4zKSVvkDEi0WLeXxbyqWy1m71SYRGqIc= 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 Delete PcdConOutGopSupport, it is unnecessary any more. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Signed-off-by: Guomin Jiang --- OvmfPkg/OvmfPkgIa32.dsc | 1 - OvmfPkg/OvmfPkgIa32X64.dsc | 1 - OvmfPkg/OvmfPkgX64.dsc | 1 - OvmfPkg/OvmfXen.dsc | 1 - 4 files changed, 4 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 404450e91491..b3249dad2423 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -449,7 +449,6 @@ [PcdsFeatureFlag] gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE !ifdef $(CSM_ENABLE) gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable|TRUE diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index aaa408ac456a..a81585ad706a 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -453,7 +453,6 @@ [PcdsFeatureFlag] gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE !ifdef $(CSM_ENABLE) gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable|TRUE diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 554515d6a9b8..754676c05f7b 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -453,7 +453,6 @@ [PcdsFeatureFlag] gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE !ifdef $(CSM_ENABLE) gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable|TRUE diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc index 70fbe8f0ddf3..065016af2220 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -334,7 +334,6 @@ [PcdsFeatureFlag] gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE !ifdef $(CSM_ENABLE) gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable|TRUE --=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 (#58861): https://edk2.groups.io/g/devel/message/58861 Mute This Topic: https://groups.io/mt/74068794/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- From nobody Sun May 5 01:01:08 2024 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+58862+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+58862+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588927135; cv=none; d=zohomail.com; s=zohoarc; b=C+Cy/dttwAymOkdE+Xp6NhnZFqTQry21fgKHZSovRXHfio1JTwwTQPupyhKKURAtoFJRuaXHNUUfLINd0SMJ0qOU3EGwCco9gv3wm6v42MhUVXWun4UmaAqEY+bRsWi0vxXD4JDPlpuxFlwswRSkDVKur9bPcmq9rqAztnXc+S8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588927135; 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=VxU0NXctyn4XR4b444pAFRtVFIk/c9+BcnVFWbPsiUk=; b=Mf/Lg3mYe48ITCCnipVkVlsP1wY9aazsMK8tgdIzWUOV4eAHUm4/mS7Ji0BNX26ED+8oyW4R9bCM3PWCRqLCt+9YodwZ7PqNa6UeOlQS7g+scfZf5rg7K2MQjsCY3+MvhYk1qWgcS0X0CnOKV7TpusyutHy3ibreskTEasYym54= 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+58862+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 1588927135716617.0043844633143; Fri, 8 May 2020 01:38:55 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id KQ4aYY1788612xxvYyhewsyW; Fri, 08 May 2020 01:38:55 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web11.6710.1588927130864428592 for ; Fri, 08 May 2020 01:38:52 -0700 IronPort-SDR: oT4I63VdH2OyoiKLemLf9NoD4R2c3mdZv1eoRvgt6yxNtTBj12CQdWUkaHwqxLi2llJP5IY6JJ j5aHP5XbwWtw== 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:52 -0700 IronPort-SDR: NX4/e3xHuRy4U2nArKYDUBh28LKsIQOAbxWFlfnbMIuftK2Xxi5M4Pdao5FCpErEch7j73utrg OcEihcO0XTNQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="305366680" 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:51 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Maurice Ma , Guo Dong , Benjamin You Subject: [edk2-devel] [PATCH 16/18] UefiPayloadPkg: Remove All UGA Support Date: Fri, 8 May 2020 16:38:22 +0800 Message-Id: <20200508083824.1785-17-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: scgnCUkqViyWgJTk0un1uCbmx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588927135; bh=2NRFfLbSiUKSDc3EokjnLeQtnKuBwh6gOKVBocYgPpI=; h=Cc:Date:From:Reply-To:Subject:To; b=pfr8XDOf0J4iZxa06V4rNgUJRC0pBUaUKsbyMvf+QU4xR/ZLSzoACoKr5+nMInH2qla VJygeNU2S/4Dr0BqdQJFqIwik+MoqbO9JcFNaB/2IZ67aGARHMTEePsr5vD+WyLkOdeaB E5vDeDTXWIf6cMQCoE5i7RWzEZYf9eiq1Ag= 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 PcdConOutGopSupport, it is unnecessary any more. Cc: Maurice Ma Cc: Guo Dong Cc: Benjamin You Signed-off-by: Guomin Jiang Reviewed-by: Maurice Ma --- .../Library/PlatformBootManagerLib/PlatformBootManager.h | 2 +- UefiPayloadPkg/UefiPayloadPkgIa32.dsc | 1 - UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootMana= ger.h b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.h index 2f600c796ff2..3ab0a24d384a 100644 --- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.h +++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.h @@ -98,7 +98,7 @@ PlatformBootManagerEnableQuietBoot ( Use SystemTable Conout to turn on video based Simple Text Out consoles. = The Simple Text Out screens will now be synced up with all non video output = devices =20 - @retval EFI_SUCCESS UGA devices are back in text mode and synced up. + @retval EFI_SUCCESS Devices are back in text mode and synced up. =20 **/ EFI_STATUS diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc b/UefiPayloadPkg/UefiPay= loadPkgIa32.dsc index e8832925eed8..d31f6ca4fb7d 100644 --- a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc +++ b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc @@ -271,7 +271,6 @@ [PcdsFeatureFlag] !endif gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE =20 [PcdsFixedAtBuild] gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x10000 diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc b/UefiPayloadPkg/Uefi= PayloadPkgIa32X64.dsc index 20462f68817d..8d67e25731e3 100644 --- a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc +++ b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc @@ -272,7 +272,6 @@ [PcdsFeatureFlag] !endif gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE =20 [PcdsFixedAtBuild] gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x10000 --=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 (#58862): https://edk2.groups.io/g/devel/message/58862 Mute This Topic: https://groups.io/mt/74068795/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- From nobody Sun May 5 01:01:08 2024 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+58863+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+58863+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588927136; cv=none; d=zohomail.com; s=zohoarc; b=BPF9/b68giHajsp69RCd2WVl4hwRMCeA9wVJWQwxd9mjBynhK8wP7jeckJp5ybppvFe0cXXXYj3OMXHgFQjMDAIThmKFVydGf2T9IoINfV+MNJyhsU4Neb5P37azRZu/jNR0AiLFWUZoslTxffbjizSK6OEM9ojMIzJzKRPPVZo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588927136; 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=ODz65/qHq0LWRQS1blEsFWd3oJwG59+xhDt3ys/JtfM=; b=fv1HBIV/z6vRgupsxfp3v34iR7w5WQ+WBD8uOViX10GTperC5VQqyCShysSpq3NjKWXCwYKa2kjrIT8/Yn2znGBvlkqjoHPN+BzYxKQC1XP24Hn53MeK/gjVd6Vi0NNwigckT+/0yFMhtgZQhTgi4r6knN6qMtAvYohAEeiY7+M= 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+58863+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 1588927136106621.2193161242327; Fri, 8 May 2020 01:38:56 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id FKRBYY1788612xrSNWQ0YpPr; Fri, 08 May 2020 01:38:55 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web11.6710.1588927130864428592 for ; Fri, 08 May 2020 01:38:54 -0700 IronPort-SDR: a6EfSw/qgejVMmhL1MbxbgNwPPmfWxMpkpCPvTHmJwvQ+1ORNizUzR9KgobMsMDr0c8ptJNxev NvK0zBvlLl6A== 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:54 -0700 IronPort-SDR: gz0+v3fLjjqUxoDIpGAvHFXYYtSZs1j5j6dXFB/prvlO4v5niVI6E03B1JsxjtmBbVR3ZCklbO y/QLSpbBZ4vg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="305366685" 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:52 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Laszlo Ersek , Ard Biesheuvel , Leif Lindholm Subject: [edk2-devel] [PATCH 17/18] ArmVirtPkg: Remove All UGA Support Date: Fri, 8 May 2020 16:38:23 +0800 Message-Id: <20200508083824.1785-18-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: lXt3gtaWlA0xhp02kit2Bb90x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588927135; bh=6zJC0UU13DMkd4JECbzBMsJD011i6OtcLZ1saZDUCfw=; h=Cc:Date:From:Reply-To:Subject:To; b=ZLhJBNJZv3gjHYuVY18QF10hroI369Nx360wFNDgoN18nwJvesQUWpsh/uljDlH85Sk ky2MYMnZab9Gw7JHuz9KiPzTmaUNUtt7lxCZZGmLSqbrPJgy5I3pF1XYElcTPoq5lVtoj eo21b1whZoOraoCR1a9eZwkEHBriALiQ1u8= 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 PcdConOutGopSupport, it is unnecessary any more. Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Leif Lindholm Signed-off-by: Guomin Jiang --- ArmVirtPkg/ArmVirtQemu.dsc | 4 ---- ArmVirtPkg/ArmVirtQemuKernel.dsc | 4 ---- 2 files changed, 8 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 4c40bf9e08cf..232bfd4b75a4 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -115,10 +115,6 @@ [PcdsFeatureFlag.common] gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderPciTranslation|TRUE gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderMmioTranslation|TRUE =20 - ## If TRUE, Graphics Output Protocol will be installed on virtual handle= created by ConsplitterDxe. - # It could be set FALSE to save size. - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE =20 gArmVirtTokenSpaceGuid.PcdTpm2SupportEnabled|$(TPM2_ENABLE) diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKerne= l.dsc index 46f01a934b69..d82635509cbb 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -102,10 +102,6 @@ [PcdsFeatureFlag.common] gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderPciTranslation|TRUE gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderMmioTranslation|TRUE =20 - ## If TRUE, Graphics Output Protocol will be installed on virtual handle= created by ConsplitterDxe. - # It could be set FALSE to save size. - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE =20 [PcdsFixedAtBuild.common] --=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 (#58863): https://edk2.groups.io/g/devel/message/58863 Mute This Topic: https://groups.io/mt/74068796/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- From nobody Sun May 5 01:01:08 2024 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+58864+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+58864+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588927136; cv=none; d=zohomail.com; s=zohoarc; b=FSBV8JElhUciolu5onepHu3Hca5JDUl7ujUAYknmPeDeP+4fPe7Ef+Wdz9h9ETlcTKbPV3wv0PEwoFcC/FrW2nigkF5n10MqlHxNwTptBtpF0vM2cIJJrjoY6i7z+t01scPJUk95pHxptxELY248vBs3OkXFwMoytHEEFmlxYkw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588927136; 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=XCWjeLS1KDxulrKvX0J7j4CmIUA+3oXImsD0Nk402qY=; b=YoboSY2SkiaFkGsMj+HyYxSTlfGIBG4UztDN4WPsXvosqJI2qYGNL4/7ousvCt6aHw5c0EMgHqrues0JeagvyrJRJOYbnh27u8GiYw/C96E8n+reh04Kr49QR9XG9B0koBHyY+MbCOFLXy700HUyXCjGs0iIf3ACgCAGXquzjFc= 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+58864+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 1588927136938651.2678133910159; Fri, 8 May 2020 01:38:56 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 12RGYY1788612xJmrbl2pb1O; Fri, 08 May 2020 01:38:56 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web11.6710.1588927130864428592 for ; Fri, 08 May 2020 01:38:56 -0700 IronPort-SDR: DEVW1cwNPdCZ88NsvBnwWpDOm3OZ4p0LDKNoNJdA9ReoLTKjLy7YAquJtGeQdxpsmFm2v6CIgl iYJolY6LMFEA== 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:55 -0700 IronPort-SDR: ZguplvEmQgZqP2jlH5o74d5q4Hxu+8Wn16uHCsxfbhC0Q+/Tf+lgmSl0QngGV3w6jluoYUpvej pJB/VQRIcYSw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="305366717" 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:54 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Jian J Wang , Hao A Wu Subject: [edk2-devel] [PATCH 18/18] MdeModulePkg: Remove All UGA Support Date: Fri, 8 May 2020 16:38:24 +0800 Message-Id: <20200508083824.1785-19-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: vrR4PosF70mfp8Eejo2ZStdOx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588927136; bh=Z9R7wgNSHHyYS9Ff8Coat/U3VE+f4g6hSXEWGC//i2Y=; h=Cc:Date:From:Reply-To:Subject:To; b=gVpG87XpME3BwoU9D+e1x/pwgnjqCs+3/eajeZBYxQLA+nzL7Igtn1fVbt0hyUhQuas SmDz80H1UQMA4TXsEc0zBJ93OnGfTqc61AYYrTR8XlPQt9W0R5/ZIVZ23U0mYj5uuiCsO uEH+znkeK4BDC3Oloj8QKYvSG9nLm2/UnV0= 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 definition. Cc: Jian J Wang Cc: Hao A Wu Signed-off-by: Guomin Jiang --- MdeModulePkg/MdeModulePkg.dec | 7 ------- MdeModulePkg/MdeModulePkg.uni | 6 ------ 2 files changed, 13 deletions(-) diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index a31f0a85883d..637ff688f247 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -684,13 +684,6 @@ [PcdsFeatureFlag] # @Prompt Enable Unicode Collation 2 support. gEfiMdeModulePkgTokenSpaceGuid.PcdUnicodeCollation2Support|TRUE|BOOLEAN|= 0x00010041 =20 - ## Indicates if Graphics Output Protocol will be installed on virtual ha= ndle created by ConsplitterDxe. - # It could be set FALSE to save size.

- # TRUE - Installs Graphics Output Protocol on virtual handle created = by ConsplitterDxe.
- # FALSE - Does not install Graphics Output Protocol on virtual handle = created by ConsplitterDxe.
- # @Prompt Enable ConOut GOP support. - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE|BOOLEAN|0x000100= 42 - ## Indicates PeiCore will first search TE section from the PEIM to load = the image, or PE32 section, when PeiCore dispatches a PEI module. # This PCD is used to tune PEI phase performance to reduce the search i= mage time. # It can be set according to the generated image section type.

diff --git a/MdeModulePkg/MdeModulePkg.uni b/MdeModulePkg/MdeModulePkg.uni index 0cfcb0039d7f..410c276f21e6 100644 --- a/MdeModulePkg/MdeModulePkg.uni +++ b/MdeModulePkg/MdeModulePkg.uni @@ -690,12 +690,6 @@ = "TRUE - Installs Unicode Collation 2 Protocol.
\n" = "FALSE - Does not install Unicode Collation 2 Protocol.<= BR>" =20 -#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdConOutGopSupport_PROMPT #la= nguage en-US "Enable ConOut GOP support" - -#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdConOutGopSupport_HELP #lang= uage en-US "Indicates if Graphics Output Protocol will be installed on virt= ual handle created by ConsplitterDxe. It could be set FALSE to save size.
\n" - = "TRUE - Installs Graphics Output Protocol on virtual handle cre= ated by ConsplitterDxe.
\n" - = "FALSE - Does not install Graphics Output Protocol on virtual ha= ndle created by ConsplitterDxe.
" - #string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdPeiCoreImageLoaderSearchTeSe= ctionFirst_PROMPT #language en-US "PeiCore search TE section first" =20 #string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdPeiCoreImageLoaderSearchTeSe= ctionFirst_HELP #language en-US "Indicates PeiCore will first search TE se= ction from the PEIM to load the image, or PE32 section, when PeiCore dispat= ches a PEI module. This PCD is used to tune PEI phase performance to reduce= the search image time. It can be set according to the generated image sect= ion type.

\n" --=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 (#58864): https://edk2.groups.io/g/devel/message/58864 Mute This Topic: https://groups.io/mt/74068797/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-