From nobody Fri May 10 21:32:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+91395+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91395+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1657849968; cv=none; d=zohomail.com; s=zohoarc; b=JGMVfkYPElsMnCYOF89bNGKtnZsoJB8am9AZJM9T1Hl0Bf4xnjE7fFb1PcfzSStPopFb4qjHOLSPQkTcMuZTDcwEawA5HuMV+EbtZ8nYO3DQTX3GdvZDstN27JAC1G23fi2epDf9SC3K7PcGwp/OsEvZdSkm9edRcMPZmISP2kM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657849968; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=xfvrlFhDDCz4Jg1fxzI2CcGI3E07XBZ+/+EKWeEvk70=; b=SdDPlzzYUCASxu4/F+m6ZsoV8SnOOA5RmD4l7QQPxj9/F2/N17+6NnUndIoWtU4H7OmjqZ1mVqG1W7Ms0Y9/Fxym9NdTzMHTscGMDyUQED6NQS7R/Z2fkvefoM4RSiQ2Ah6rZjRCB6Gh9YSQYXZn+CYDklhXG5/HMwTFdj3OhBg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91395+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1657849968076333.78707615114786; Thu, 14 Jul 2022 18:52:48 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id bmxsYY1788612xzHbT65LbjD; Thu, 14 Jul 2022 18:52:47 -0700 X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web08.1841.1657849966764638116 for ; Thu, 14 Jul 2022 18:52:47 -0700 X-IronPort-AV: E=McAfee;i="6400,9594,10408"; a="347355562" X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="347355562" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:26 -0700 X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="923318641" X-Received: from guominji-mobl1.ccr.corp.intel.com ([10.238.11.184]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:24 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Guo Dong , Ray Ni , Maurice Ma , Benjamin You , Sean Rhodes Subject: [edk2-devel] [Patch v2 01/11] UefiPayloadPkg: Remove All UGA Support Date: Fri, 15 Jul 2022 09:50:56 +0800 Message-Id: <20220715015106.1553-2-guomin.jiang@intel.com> In-Reply-To: <20220715015106.1553-1-guomin.jiang@intel.com> References: <20220715015106.1553-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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: YbsrXsjg18BY5Qtnsa3NAGlWx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1657849967; bh=QZgWUds96+k+QYhjulhs+QuNcf0jw3V32uNwkIdp2mg=; h=Cc:Date:From:Reply-To:Subject:To; b=uYfvvQMc58NzKdT0jxh/i13Zt3SRsljFT6CYkUF/MbdeuRRCAf49pe7R6ruJqJlxPFr AM8niZ7otjzKVVv5+59ltZlGyV72nH/XZ8GQV8soXwP7XTQ2bSD8ZMb00+0RT0dNJbvqY x27ayLjPAondHK599P2Zk4XG2ovZZrRLS+A= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1657849970219100018 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. Remove All UGA Support in UefiPayloadPkg. Signed-off-by: Guomin Jiang Cc: Guo Dong Cc: Ray Ni Cc: Maurice Ma Cc: Benjamin You Cc: Sean Rhodes Reviewed-by: Ray Ni --- .../Library/PlatformBootManagerLib/PlatformBootManager.h | 4 ++-- .../Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 4 +--- UefiPayloadPkg/UefiPayloadPkg.dsc | 2 -- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootMana= ger.h b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.h index 5614aadafb98..0f93287ac1f7 100644 --- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.h +++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.h @@ -1,7 +1,7 @@ /** @file Head file for BDS Platform specific code =20 -Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2015 - 2022, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ =20 @@ -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 Graphic devices are back in text mode and synced= up. =20 **/ EFI_STATUS diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootMana= gerLib.inf b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootMana= gerLib.inf index 9f58c460cd6b..2ebe7b3fd960 100644 --- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.= inf +++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.= inf @@ -1,7 +1,7 @@ ## @file # Include all platform action which can be customized by IBV/OEM. # -# Copyright (c) 2012 - 2021, Intel Corporation. All rights reserved.
+# Copyright (c) 2012 - 2022, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # ## @@ -55,7 +55,6 @@ [Protocols] gEfiGenericMemTestProtocolGuid ## CONSUMES gEfiGraphicsOutputProtocolGuid ## CONSUMES - gEfiUgaDrawProtocolGuid ## CONSUMES gEfiBootLogoProtocolGuid ## CONSUMES gEfiDxeSmmReadyToLockProtocolGuid gEfiSmmAccess2ProtocolGuid @@ -65,7 +64,6 @@ =20 [Pcd] gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut - gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayload= Pkg.dsc index 2428bb2ce9a9..50b9b017588d 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -373,8 +373,6 @@ ##########################################################################= ###### [PcdsFeatureFlag] gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE ## This PCD specified whether ACPI SDT protocol is installed. gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdHiiOsRuntimeSupport|FALSE --=20 2.26.2.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 (#91395): https://edk2.groups.io/g/devel/message/91395 Mute This Topic: https://groups.io/mt/92393242/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 Fri May 10 21:32:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+91396+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91396+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1657849969; cv=none; d=zohomail.com; s=zohoarc; b=eeZEgo4lC5Q4dMgHSeMoogZ6MFMU/SjiSmmk84jVZXKdjrO7yO8vhJGIAJzARKq0j6KTLzO1YwAkUcrQ0gUvNcSG/BbO1w3EmFoTSOsxCMJSySRrIaNR/quuciimsn6jqqtXSuO7/0SUl6aGNnVvgLUok+HnKb5VmkqOWIn8V8o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657849969; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=qLezna6tD9Z+tH5xL5qBooAZW9G2J8EHJYNhgdvaB8o=; b=e6jEhtUa4b3O052oGELxOkKdB0P6DWZHTtgwQYUM8av8B2HEVaTk3U4Up8nMvacSol9rRqi1m8jbMaW1kOl8PM4GqMneXmBTx2wJTMHlI8uwclhAAfSk9prC+qA+AkQ+kfhT40DAJ9uw8t29/7CeJqYsok5UH8UnO83vREcQPQ8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91396+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1657849969131412.4032807002693; Thu, 14 Jul 2022 18:52:49 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id tWIQYY1788612xMtNmHoWDrk; Thu, 14 Jul 2022 18:52:48 -0700 X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web08.1841.1657849966764638116 for ; Thu, 14 Jul 2022 18:52:47 -0700 X-IronPort-AV: E=McAfee;i="6400,9594,10408"; a="347355567" X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="347355567" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:28 -0700 X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="923318645" X-Received: from guominji-mobl1.ccr.corp.intel.com ([10.238.11.184]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:26 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Ard Biesheuvel , Leif Lindholm , Sami Mujawar , Gerd Hoffmann Subject: [edk2-devel] [Patch v2 02/11] ArmVirtPkg: Remove All UGA Support Date: Fri, 15 Jul 2022 09:50:57 +0800 Message-Id: <20220715015106.1553-3-guomin.jiang@intel.com> In-Reply-To: <20220715015106.1553-1-guomin.jiang@intel.com> References: <20220715015106.1553-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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: CH5oao7QulDILBqDzOSIvNcpx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1657849968; bh=OSqDZ9qOhvWz+xBjynYG4kqgNMdRbCIpnK+8/6fbM+U=; h=Cc:Date:From:Reply-To:Subject:To; b=GE3ywIMkQEUnp7y1YVhfS4suXiGnf6LZfDiUcIAT0WomEfLijsfkTMaz5FVYMr1L66I 3ykQJL26f2KP1f6WiuCN7qh0HF035V7yIjbPZPTmBTpJRtfm2E4+VqyiNywPkWuMUVyC0 GQhP/xaF8lv1Je7ljAwxTBPr5hEoSrxHHwM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1657849970199100015 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. Remove All UGA Support in ArmVirtPkg Signed-off-by: Guomin Jiang Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Sami Mujawar Cc: Gerd Hoffmann Reviewed-by: Sami Mujawar --- ArmVirtPkg/ArmVirtQemu.dsc | 7 +------ ArmVirtPkg/ArmVirtQemuKernel.dsc | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 9369a88858fd..dc87050f3f3a 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -1,7 +1,7 @@ # # Copyright (c) 2011-2015, ARM Limited. All rights reserved. # Copyright (c) 2014, Linaro Limited. All rights reserved. -# Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved. +# Copyright (c) 2015 - 2022, Intel Corporation. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -125,11 +125,6 @@ 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.PcdConOutUgaSupport|FALSE - gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE =20 gArmVirtTokenSpaceGuid.PcdTpm2SupportEnabled|$(TPM2_ENABLE) diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKerne= l.dsc index 7f7d15d6eee3..0d13d8edb407 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -1,7 +1,7 @@ # # Copyright (c) 2011-2015, ARM Limited. All rights reserved. # Copyright (c) 2014, Linaro Limited. All rights reserved. -# Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved. +# Copyright (c) 2015 - 2022, Intel Corporation. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -107,11 +107,6 @@ 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.PcdConOutUgaSupport|FALSE - gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE =20 [PcdsFixedAtBuild.common] --=20 2.26.2.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 (#91396): https://edk2.groups.io/g/devel/message/91396 Mute This Topic: https://groups.io/mt/92393243/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 Fri May 10 21:32:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+91397+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91397+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1657849969; cv=none; d=zohomail.com; s=zohoarc; b=kv0wfMgdE4XUygSXkSZDrmU/3uj3lizFyGlWNcdQmJWJcqxsj1Q0z3j1EW0UBniA773vE9KcYWDBX+wDjUrG+O//rHmdSv4ja+7pmPK3mr3DfwkSL76gWYjr+XhcaIjezfjeBmPdF68DM8czqbtP6bQnTDH1rGoSfjGgpp7EUVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657849969; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=1L+N8g2izH5pIx6OUWLsD9A2rWmvuyJ/dlbeoyoTB1Q=; b=TuU11ebWJNG1bOsCDomjNelA/voJeLGqcbVFX/d64nA3ZvHLelizM+XeP2qIQP666Suwn8msijI9CGm6E0TYC8HieTIePAPCjtrFlKMlRHfnH84KEt33L2dRxA9K1uZQimNXKqZxXm2VIs41tAk75LJx3uHsUjg8ny6RjLO8pmo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91397+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 16578499691641019.5840534572485; Thu, 14 Jul 2022 18:52:49 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id k0mmYY1788612xzIhLjn8GCc; Thu, 14 Jul 2022 18:52:48 -0700 X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web08.1841.1657849966764638116 for ; Thu, 14 Jul 2022 18:52:47 -0700 X-IronPort-AV: E=McAfee;i="6400,9594,10408"; a="347355572" X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="347355572" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:29 -0700 X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="923318651" X-Received: from guominji-mobl1.ccr.corp.intel.com ([10.238.11.184]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:27 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Leif Lindholm , Ard Biesheuvel , Sami Mujawar Subject: [edk2-devel] [Patch v2 03/11] ArmPkg: Remove All UGA Support Date: Fri, 15 Jul 2022 09:50:58 +0800 Message-Id: <20220715015106.1553-4-guomin.jiang@intel.com> In-Reply-To: <20220715015106.1553-1-guomin.jiang@intel.com> References: <20220715015106.1553-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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: Nh7ORz0w83LVqFXiikDz32HDx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1657849968; bh=wZaNS4gFWAeMB7kckO0/72EFP8ACN4CByp43n791kWM=; h=Cc:Date:From:Reply-To:Subject:To; b=CQ2pVOZvdmL7v4CVtcS60S5iQA+ax5cN4otbVamcxx5B2MawkHmLkiO80MMaDqS4eq3 9YCDG/bp6myKcW5eXfTVLEsZ/H/USdbLco6XoVdFINI2w7s7BpH3kUTtq+2097baC/D8j ghs38fHDXMZrWctoVNOrlxzzNh1r4rqzZ3A= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1657849970202100016 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. Signed-off-by: Guomin Jiang Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Sami Mujawar Reviewed-by: Sami Mujawar --- ArmPkg/Library/PlatformBootManagerLib/PlatformBm.h | 4 ++-- .../PlatformBootManagerLib/PlatformBootManagerLib.inf | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.h b/ArmPkg/Li= brary/PlatformBootManagerLib/PlatformBm.h index a40a2ff5cb4f..a2ec4c4ad6c7 100644 --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.h +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.h @@ -2,7 +2,7 @@ Head file for BDS Platform specific code =20 Copyright (C) 2015-2016, Red Hat, Inc. - Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.
+ Copyright (c) 2004 - 2022, Intel Corporation. All rights reserved.
Copyright (c) 2016, Linaro Ltd. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent @@ -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 Graphic 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 86751b45f82b..63d1d83ab0ef 100644 --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -3,7 +3,7 @@ # # Copyright (C) 2015-2016, Red Hat, Inc. # Copyright (c) 2014, ARM Ltd. All rights reserved.
-# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2022, Intel Corporation. All rights reserved.
# Copyright (c) 2016, Linaro Ltd. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent @@ -51,9 +51,6 @@ UefiLib UefiRuntimeServicesTableLib =20 -[FeaturePcd] - gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport - [FixedPcd] gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString --=20 2.26.2.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 (#91397): https://edk2.groups.io/g/devel/message/91397 Mute This Topic: https://groups.io/mt/92393244/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 Fri May 10 21:32:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+91399+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91399+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1657849969; cv=none; d=zohomail.com; s=zohoarc; b=FqU6926+cnMmZJINlVnncmxaOCBY1QQEmd4jJGgm4A4jg8iYuQfucLitvxmMFsQNhA+6rCjg3z14vB/OIl3wyTXzATmONG8r6438inmoHyipp+UShoBbeIpYT9FZXV1GoH6b6ZrfPyhjW/ynDdbmUUZ6aQ4nr5ida1n2NHKAsEA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657849969; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=EG15MEEvHYo54gNfrVbgMScwNv4i2d8eOv2GxcI5dNM=; b=k91uNMSccH8fkuJt6xbMgDu4q+9TkaYYLtBPzCSIfiWIaarYomosVo1xkQRa+kyCkSzOcSboeLX4jxlcSS/SHkVwQqlkip2cGzFzeeV/Y7VL9PUg3z2q5MlR3dlGUOqQVf6GP+NlKKyKevFsZE9Sb6AcidNO69rQWkf9XdZeDDI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91399+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1657849969872722.9398198562525; Thu, 14 Jul 2022 18:52:49 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 8XPzYY1788612xzIrX0U0Sw1; Thu, 14 Jul 2022 18:52:49 -0700 X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web09.1854.1657849968056452145 for ; Thu, 14 Jul 2022 18:52:48 -0700 X-IronPort-AV: E=McAfee;i="6400,9594,10408"; a="347355573" X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="347355573" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:31 -0700 X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="923318657" X-Received: from guominji-mobl1.ccr.corp.intel.com ([10.238.11.184]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:29 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Andrew Fish , Ray Ni Subject: [edk2-devel] [Patch v2 04/11] EmulatorPkg: Remove All UGA Support Date: Fri, 15 Jul 2022 09:50:59 +0800 Message-Id: <20220715015106.1553-5-guomin.jiang@intel.com> In-Reply-To: <20220715015106.1553-1-guomin.jiang@intel.com> References: <20220715015106.1553-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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: kI9bSqv8G96XNfR6gbX1rIFSx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1657849969; bh=1Or/MOi8l4gTjSd/WU0z9gMFV3FWH9o5t5B4xUCo1ro=; h=Cc:Date:From:Reply-To:Subject:To; b=ahsMU0R1kGpoT7IBnNMHVgF1mNorDOBi7Ma3SNTUKmWaFQmcqO1Ht0ybpgD0x4+IjmW 0wbxidN8AHws1nsR/zuvZJHfNGW9ZCFLHYmsYxtCRP+r3lniHxZ5ucHFddt2uMVuW0TSt J68MpgSEtLT6+jY528Qy6kSPvvVJUT2XQh0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1657849970240100020 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. Signed-off-by: Guomin Jiang Cc: Andrew Fish Cc: Ray Ni Reviewed-by: Ray Ni --- EmulatorPkg/EmuGopDxe/Gop.h | 10 +-- EmulatorPkg/EmuGopDxe/GopScreen.c | 14 ++-- EmulatorPkg/Include/Protocol/EmuFileSystem.h | 24 +++--- .../Include/Protocol/EmuGraphicsWindow.h | 18 ++-- .../Library/PlatformBmLib/PlatformBm.h | 4 +- .../Library/PlatformBmLib/PlatformBmData.c | 6 +- EmulatorPkg/Unix/Host/Gasket.h | 12 +-- EmulatorPkg/Unix/Host/Host.h | 3 +- EmulatorPkg/Unix/Host/Ia32/Gasket.S | 2 +- EmulatorPkg/Unix/Host/X11GraphicsWindow.c | 82 +++++++++---------- EmulatorPkg/Unix/Host/X64/Gasket.S | 2 +- EmulatorPkg/Win/Host/WinGopScreen.c | 10 +-- 12 files changed, 92 insertions(+), 95 deletions(-) diff --git a/EmulatorPkg/EmuGopDxe/Gop.h b/EmulatorPkg/EmuGopDxe/Gop.h index 7f7dc4e8eb9f..59ebfda912eb 100644 --- a/EmulatorPkg/EmuGopDxe/Gop.h +++ b/EmulatorPkg/EmuGopDxe/Gop.h @@ -1,13 +1,13 @@ /*++ @file =20 -Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
Portions copyright (c) 2010,Apple Inc. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 -#ifndef __UGA_H_ -#define __UGA_H_ +#ifndef GOP_H_ +#define GOP_H_ =20 #include =20 @@ -60,8 +60,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; @@ -83,7 +81,7 @@ typedef struct { GOP_MODE_DATA *ModeData; =20 // - // UGA Private Data knowing when to start hardware + // Private Data knowing when to start hardware // BOOLEAN HardwareNeedsStarting; =20 diff --git a/EmulatorPkg/EmuGopDxe/GopScreen.c b/EmulatorPkg/EmuGopDxe/GopS= creen.c index 88d95b88e162..113b496861b4 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 @@ -209,7 +209,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 // @@ -220,8 +220,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; @@ -232,8 +232,8 @@ EmuGopBlt ( GopBltArgs.Delta =3D Delta; Status =3D Private->EmuGraphicsWindow->Blt ( Private->EmuGrap= hicsWindow, - (EFI_UGA_PIXEL *= )BltBuffer, - (EFI_UGA_BLT_OPE= RATION)BltOperation, + BltBuffer, + BltOperation, &GopBltArgs ); =20 @@ -384,7 +384,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 15de43ac022e..062508fafc9d 100644 --- a/EmulatorPkg/Include/Protocol/EmuFileSystem.h +++ b/EmulatorPkg/Include/Protocol/EmuFileSystem.h @@ -7,19 +7,19 @@ =20 UEFI 2.0 can boot from any valid EFI image contained in a SimpleFileSyst= em. =20 -Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
Portions copyright (c) 2011, Apple Inc. All rights reserved. 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 @@ -88,10 +88,10 @@ typedef struct { 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 EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args + IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows, + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL, + IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation, + IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args ); =20 typedef diff --git a/EmulatorPkg/Include/Protocol/EmuGraphicsWindow.h b/EmulatorPkg= /Include/Protocol/EmuGraphicsWindow.h index 7c495b25eb1b..ed7b71611f90 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 @@ -83,8 +83,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 b89ffd77e4de..462049e2b048 100644 --- a/EmulatorPkg/Library/PlatformBmLib/PlatformBm.h +++ b/EmulatorPkg/Library/PlatformBmLib/PlatformBm.h @@ -1,6 +1,6 @@ /*++ @file =20 -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
Portions copyright (c) 2011, Apple Inc. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -60,7 +60,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 // // Platform BDS Functions diff --git a/EmulatorPkg/Library/PlatformBmLib/PlatformBmData.c b/EmulatorP= kg/Library/PlatformBmLib/PlatformBmData.c index efb03def37eb..b69c4728d1a7 100644 --- a/EmulatorPkg/Library/PlatformBmLib/PlatformBmData.c +++ b/EmulatorPkg/Library/PlatformBmLib/PlatformBmData.c @@ -1,6 +1,6 @@ /*++ @file =20 -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
Portions copyright (c) 2011, Apple Inc. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 #include "PlatformBm.h" =20 -EMU_PLATFORM_UGA_DEVICE_PATH gGopDevicePath =3D { +EMU_PLATFORM_GRAPHICS_WINDOW_DEVICE_PATH gGopDevicePath =3D { { { { @@ -40,7 +40,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 6dafc903cfce..1ffdfb334524 100644 --- a/EmulatorPkg/Unix/Host/Gasket.h +++ b/EmulatorPkg/Unix/Host/Gasket.h @@ -1,7 +1,7 @@ /** @file =20 Copyright (c) 2008 - 2011, Apple Inc. All rights reserved.
- Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved.
+ Copyright (c) 2011 - 2022, Intel Corporation. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -200,7 +200,7 @@ ReverseGasketUint64Uint64 ( ); =20 // -// Gasket functions for EFI_EMU_UGA_IO_PROTOCOL +// Gasket functions for EFI_EMU_GRAPHICS_WINDOW_PROTOCOL // =20 EFI_STATUS @@ -243,10 +243,10 @@ GasketX11RegisterKeyNotify ( EFI_STATUS EFIAPI GasketX11Blt ( - IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows, - IN EFI_UGA_PIXEL *BltBuffer OPTIONAL, - IN EFI_UGA_BLT_OPERATION BltOperation, - IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args + IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows, + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL, + IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation, + IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args ); =20 EFI_STATUS diff --git a/EmulatorPkg/Unix/Host/Host.h b/EmulatorPkg/Unix/Host/Host.h index 0c81cdfc01f5..ff30f5dce567 100644 --- a/EmulatorPkg/Unix/Host/Host.h +++ b/EmulatorPkg/Unix/Host/Host.h @@ -1,6 +1,6 @@ /*++ @file =20 -Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent @@ -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 a30cc19dbe0a..b3880e198855 100644 --- a/EmulatorPkg/Unix/Host/X11GraphicsWindow.c +++ b/EmulatorPkg/Unix/Host/X11GraphicsWindow.c @@ -1,6 +1,6 @@ /*++ @file =20 -Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2022, Intel Corporation. All rights reserved.
Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent @@ -700,8 +700,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) @@ -709,15 +709,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; @@ -782,7 +782,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 // } } @@ -812,32 +812,32 @@ X11RegisterKeyNotify ( =20 EFI_STATUS X11Blt ( - IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo, - IN EFI_UGA_PIXEL *BltBuffer OPTIONAL, - IN EFI_UGA_BLT_OPERATION BltOperation, - IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args + IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo, + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL, + IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation, + IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args ) { - GRAPHICS_IO_PRIVATE *Private; - UINTN DstY; - UINTN SrcY; - UINTN DstX; - UINTN SrcX; - UINTN Index; - EFI_UGA_PIXEL *Blt; - UINT8 *Dst; - UINT8 *Src; - UINTN Nbr; - unsigned long Color; - XEvent ev; + GRAPHICS_IO_PRIVATE *Private; + UINTN DstY; + UINTN SrcY; + UINTN DstX; + UINTN SrcX; + UINTN Index; + EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Blt; + UINT8 *Dst; + UINT8 *Src; + UINTN Nbr; + unsigned long Color; + XEvent ev; =20 Private =3D (GRAPHICS_IO_PRIVATE *)GraphicsIo; =20 // // Check bounds // - if ( (BltOperation =3D=3D EfiUgaVideoToBltBuffer) - || (BltOperation =3D=3D EfiUgaVideoToVideo)) + if ( (BltOperation =3D=3D EfiBltVideoToBltBuffer) + || (BltOperation =3D=3D EfiBltVideoToVideo)) { // // Source is Video. @@ -851,9 +851,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 @@ -868,32 +868,32 @@ X11Blt ( } =20 switch (BltOperation) { - case EfiUgaVideoToBltBuffer: - Blt =3D (EFI_UGA_PIXEL *)((UINT8 *)BltBuffer + (Args->Desti= nationY * Args->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 *)BltBuffe= r + (Args->DestinationY * Args->Delta) + Args->DestinationX * sizeof (EFI_G= RAPHICS_OUTPUT_BLT_PIXEL)); + Args->Delta -=3D Args->Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL= ); for (SrcY =3D Args->SourceY; SrcY < (Args->Height + Args->SourceY); = SrcY++) { for (SrcX =3D Args->SourceX; SrcX < (Args->Width + Args->SourceX);= SrcX++) { *Blt++ =3D X11ColorToPixel (Private, XGetPixel (Private->image, = SrcX, SrcY)); } =20 - Blt =3D (EFI_UGA_PIXEL *)((UINT8 *)Blt + Args->Delta); + Blt =3D (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)((UINT8 *)Blt + Args->Del= ta); } =20 break; - case EfiUgaBltBufferToVideo: - Blt =3D (EFI_UGA_PIXEL *)((UINT8 *)BltBuffer + (Args->Sourc= eY * 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 *)BltBuffe= r + (Args->SourceY * Args->Delta) + Args->SourceX * sizeof (EFI_GRAPHICS_OU= TPUT_BLT_PIXEL)); + Args->Delta -=3D Args->Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL= ); for (DstY =3D Args->DestinationY; DstY < (Args->Height + Args->Desti= nationY); DstY++) { for (DstX =3D Args->DestinationX; DstX < (Args->Width + Args->Dest= inationX); DstX++) { XPutPixel (Private->image, DstX, DstY, X11PixelToColor (Private,= *Blt)); Blt++; } =20 - Blt =3D (EFI_UGA_PIXEL *)((UINT8 *)Blt + Args->Delta); + Blt =3D (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)((UINT8 *)Blt + Args->Del= ta); } =20 break; - case EfiUgaVideoToVideo: + case EfiBltVideoToVideo: Dst =3D Private->image_data + (Args->DestinationX << Private->pixel_= shift) + Args->DestinationY * Private->line_bytes; Src =3D Private->image_data + (Args->SourceX << Private->pixel_shift) @@ -920,7 +920,7 @@ X11Blt ( } =20 break; - case EfiUgaVideoFill: + case EfiBltVideoFill: Color =3D X11PixelToColor (Private, *BltBuffer); for (DstY =3D Args->DestinationY; DstY < (Args->Height + Args->Desti= nationY); DstY++) { for (DstX =3D Args->DestinationX; DstX < (Args->Width + Args->Dest= inationX); DstX++) { @@ -937,7 +937,7 @@ X11Blt ( // Refresh screen. // switch (BltOperation) { - case EfiUgaVideoToVideo: + case EfiBltVideoToVideo: XCopyArea ( Private->display, Private->win, @@ -960,7 +960,7 @@ X11Blt ( } =20 break; - case EfiUgaVideoFill: + case EfiBltVideoFill: Color =3D X11PixelToColor (Private, *BltBuffer); XSetForeground (Private->display, Private->gc, Color); XFillRectangle ( @@ -974,7 +974,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 661573d7771c..69abcfc79564 100644 --- a/EmulatorPkg/Win/Host/WinGopScreen.c +++ b/EmulatorPkg/Win/Host/WinGopScreen.c @@ -1,6 +1,6 @@ /** @file =20 -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 Module Name: @@ -396,10 +396,10 @@ WinNtWndSize ( // TODO: Delta - add argument and description to function comment EFI_STATUS WinNtWndBlt ( - IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo, - IN EFI_UGA_PIXEL *BltBuffer OPTIONAL, - IN EFI_UGA_BLT_OPERATION BltOperation, - IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args + IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo, + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL, + IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation, + IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args ) { RETURN_STATUS RStatus; --=20 2.26.2.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 (#91399): https://edk2.groups.io/g/devel/message/91399 Mute This Topic: https://groups.io/mt/92393247/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 Fri May 10 21:32:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+91398+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91398+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1657849969; cv=none; d=zohomail.com; s=zohoarc; b=a+2g7iF4RkqpgP5RGsJC1jHmGTqrnJqyK8ExhfdNiDwgFTUYMQh1yWrGc0w95XZGGaPG6wgIVOs3XKh43qU37kyR4oYQG6hc5i+Ojwl2eH6zxAO5I9MSEzbDtSpmymQziR6s7GTieLfjB2CaSrewC9WlnuOFV7Aabh7kfdYGyu4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657849969; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=5MhPTOU/ugQvQ4YaHMYnwq77YGNHgO5wracvhyroEus=; b=abfwncEFhcd9G1fbPAQ0tAkcv/phifxdZOgpCfCA7m5GFhR4eNP+O1kycSsiDDAK8KCSNzciIdaeXN2+4+0NcgrqwuXP+rx78Tz9JDK2el3iv4JkT/K51v+igbap7/zbrpYNYWvtNzUxcp/3J6KHR+HX0Y672uyPjB9rmwWP/IU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91398+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1657849969492842.9156935535264; Thu, 14 Jul 2022 18:52:49 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id MSDEYY1788612xqrVmyNRhyX; Thu, 14 Jul 2022 18:52:49 -0700 X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web08.1841.1657849966764638116 for ; Thu, 14 Jul 2022 18:52:48 -0700 X-IronPort-AV: E=McAfee;i="6400,9594,10408"; a="347355577" X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="347355577" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:34 -0700 X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="923318661" X-Received: from guominji-mobl1.ccr.corp.intel.com ([10.238.11.184]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:30 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Ray Ni , Zhichao Gao Subject: [edk2-devel] [Patch v2 05/11] ShellPkg: Remove All UGA Support Date: Fri, 15 Jul 2022 09:51:00 +0800 Message-Id: <20220715015106.1553-6-guomin.jiang@intel.com> In-Reply-To: <20220715015106.1553-1-guomin.jiang@intel.com> References: <20220715015106.1553-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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: a5l16fcx9H4lISIbsdCnDLKGx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1657849969; bh=F36Au1qe+3VQ2zntKmztyPSuulPN+efUOYLj5QrS0S8=; h=Cc:Date:From:Reply-To:Subject:To; b=JAgy2l6MV8RcPMew7CXLh7R8NL9A7IimHF35vxzdR/0Xm0g+r2gX77Hzf8iW7OWLtN5 fYIMBk8VDZWWevv3LK9YQlmwj+Wu+QYKJhEuC3o0KqKH2V8dsIJvXmQoV3hyCloWODQbn vKRvp+HkPUjRXdgFfvOVoaoCqFyn1h3nmDw= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1657849970217100017 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. Signed-off-by: Guomin Jiang Cc: Ray Ni Cc: Zhichao Gao Reviewed-by: Ray Ni --- ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c | 4 +--- ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h | 4 +--- .../Library/UefiHandleParsingLib/UefiHandleParsingLib.inf | 4 +--- .../Library/UefiHandleParsingLib/UefiHandleParsingLib.uni | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b= /ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c index aa0115bdd498..08215ab8039c 100644 --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c @@ -1,7 +1,7 @@ /** @file Provides interface to advanced shell functionality for parsing both hand= le and protocol database. =20 - Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 2022, Intel Corporation. All rights reserved.
(C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.
(C) Copyright 2015-2021 Hewlett Packard Enterprise Development LP
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -2238,8 +2238,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 6be0d78c4c5a..b3433eda029b 100644 --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h @@ -1,7 +1,7 @@ /** @file Provides interface to advanced shell functionality for parsing both hand= le and protocol database. =20 - Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2011 - 2022, Intel Corporation. All rights reserved.
(C) Copyright 2016 Hewlett Packard Enterprise Development LP
(C) Copyright 2013-2016 Hewlett-Packard Development Company, L.P.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -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 0d483805e712..af16569b07bd 100644 --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf @@ -1,6 +1,6 @@ ## @file # Provides interface to advanced shell functionality for parsing both han= dle and protocol database. -# Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2010 - 2022, Intel Corporation. All rights reserved.
# (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.
# (C) Copyright 2015-2021 Hewlett Packard Enterprise Development LP
# @@ -129,8 +129,6 @@ 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 aa3396cea94d..04beea8e7f3e 100644 --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni @@ -1,6 +1,6 @@ // /** // -// Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.
+// Copyright (c) 2010 - 2022, Intel Corporation. All rights reserved.
// (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.
// (C) Copyright 2015-2021 Hewlett Packard Enterprise Development LP
// SPDX-License-Identifier: BSD-2-Clause-Patent @@ -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.26.2.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 (#91398): https://edk2.groups.io/g/devel/message/91398 Mute This Topic: https://groups.io/mt/92393246/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 Fri May 10 21:32:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+91400+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91400+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1657849969; cv=none; d=zohomail.com; s=zohoarc; b=Uk1dTbtn3e6gpxzsHpTYFIsRvcctP7FaGYH+TKI8pJWkukFNlbEsRhPgatb/Pg/6qESXn6SUMj3kc4dQNRv3j80ly7uGhJ1x2GBYQxPSz//Ve6ErHRAVVrST5UwmN9LP+8SRyWRa1bJN1xwpsCLgugoxvHy8MJ60WmLUle3Fr6g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657849969; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=lSaGcTcLDprEtDWfwMoJr7jPLGAB7JkmuU6sbpcU+GI=; b=SpLcLefTWUW4AQEG5nWnTtPCqN6nGTIK60NV3p/zEHKkhaVJEzqG+LmfPQPcXfk61ISYve8tJUFOo9+D64+Fzq4rZXXNZ9YKUviLpeAoXJTdfRQkMYnXpHS0YH5ugyZIBtMt7lCIvS3tzgtW6JfGQAj6L1/FRZ3SwWCnLBrNQtI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91400+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1657849969923733.0338845753936; Thu, 14 Jul 2022 18:52:49 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id JRJzYY1788612xTt6a3CTrJA; Thu, 14 Jul 2022 18:52:49 -0700 X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web08.1841.1657849966764638116 for ; Thu, 14 Jul 2022 18:52:48 -0700 X-IronPort-AV: E=McAfee;i="6400,9594,10408"; a="347355580" X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="347355580" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:38 -0700 X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="923318669" X-Received: from guominji-mobl1.ccr.corp.intel.com ([10.238.11.184]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:32 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Ard Biesheuvel , Jiewen Yao , Jordan Justen , Gerd Hoffmann , Brijesh Singh , Erdem Aktas , James Bottomley , Min Xu , Tom Lendacky , Rebecca Cran , Peter Grehan , Anthony Perard , Julien Grall Subject: [edk2-devel] [Patch v2 06/11] OvmfPkg: Remove All UGA Support Date: Fri, 15 Jul 2022 09:51:01 +0800 Message-Id: <20220715015106.1553-7-guomin.jiang@intel.com> In-Reply-To: <20220715015106.1553-1-guomin.jiang@intel.com> References: <20220715015106.1553-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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: yHWmv4uMMLcxFtKkMvPQ9fmox1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1657849969; bh=P6xw4T4Uu0KH29lYjgldwXaHOMO3QxOG63uIYjg2/6o=; h=Cc:Date:From:Reply-To:Subject:To; b=sCnv1CpIEpI++kuF8vIYB80WWazYeVH2/5y38E/Vr1fBPMKNRL0Yx45BDn39uL8D7u/ TxswUNmsMsHnj4yh9PM3NDm2O+9bBb7aShfG/Aw63pH5UxnMPkeiNpNbjsnukHVN6YcS2 dxj/FKfQnQfcLAOR2Sas+5jd5AfuSXC3N/A= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1657849970220100019 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. Signed-off-by: Guomin Jiang Cc: Ard Biesheuvel Cc: Jiewen Yao Cc: Jordan Justen Cc: Gerd Hoffmann Cc: Brijesh Singh Cc: Erdem Aktas Cc: James Bottomley Cc: Min Xu Cc: Tom Lendacky Cc: Rebecca Cran Cc: Peter Grehan Cc: Anthony Perard Cc: Julien Grall --- OvmfPkg/AmdSev/AmdSevX64.dsc | 4 +--- OvmfPkg/Bhyve/BhyveX64.dsc | 4 +--- OvmfPkg/Microvm/MicrovmX64.dsc | 4 +--- OvmfPkg/OvmfPkgIa32.dsc | 2 -- OvmfPkg/OvmfPkgIa32X64.dsc | 2 -- OvmfPkg/OvmfPkgX64.dsc | 2 -- OvmfPkg/OvmfXen.dsc | 4 +--- 7 files changed, 4 insertions(+), 18 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index 726521c94381..8fc1f85ad012 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -3,7 +3,7 @@ # virtual machine remote attestation and secret injection # # Copyright (c) 2020 James Bottomley, IBM Corporation. -# Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
# # SPDX-License-Identifier: BSD-2-Clause-Patent @@ -379,8 +379,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdHiiOsRuntimeSupport|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE =20 [PcdsFixedAtBuild] diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc index d4f0c90b8e00..d827adec363c 100644 --- a/OvmfPkg/Bhyve/BhyveX64.dsc +++ b/OvmfPkg/Bhyve/BhyveX64.dsc @@ -1,6 +1,6 @@ # # Copyright (c) 2020, Rebecca Cran -# Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
# Copyright (c) 2014, Pluribus Networks, Inc. # @@ -419,8 +419,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdHiiOsRuntimeSupport|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE =20 [PcdsFixedAtBuild] diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc index 61db9b6e4c83..bea69475387d 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -1,7 +1,7 @@ ## @file # EFI/Framework Open Virtual Machine Firmware (OVMF) platform # -# Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
# Copyright (c) Microsoft Corporation. # @@ -454,8 +454,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdHiiOsRuntimeSupport|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE =20 [PcdsFixedAtBuild] diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index e708411076ca..92355f67aa50 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -458,8 +458,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdHiiOsRuntimeSupport|FALSE 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 0b036d8bb53f..a73e52701d17 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -464,8 +464,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdHiiOsRuntimeSupport|FALSE 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 8ad04b50f74f..8c4e4d9ec578 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -481,8 +481,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdHiiOsRuntimeSupport|FALSE 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 58a7c97cddf7..388fb3267efe 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -1,7 +1,7 @@ ## @file # EFI/Framework Open Virtual Machine Firmware (OVMF) platform # -# Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
# Copyright (c) 2019, Citrix Systems, Inc. # Copyright (c) Microsoft Corporation. @@ -359,8 +359,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdHiiOsRuntimeSupport|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE !ifdef $(CSM_ENABLE) gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable|TRUE --=20 2.26.2.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 (#91400): https://edk2.groups.io/g/devel/message/91400 Mute This Topic: https://groups.io/mt/92393248/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 Fri May 10 21:32:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+91393+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91393+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1657849911; cv=none; d=zohomail.com; s=zohoarc; b=Cm5HiMaZtacQ/RHQNI1Y5Vk0/KNnXe6WbNtgZGiHj9NFyYKZXOufr65I8I7vcZbznDf34iYC51Qe9le17+GHuB7FlCxx2ssFFu0xn7w16XxHcHKLfZgmqfUnwPSICgOC4i6dqoOUNYYzwAcRqy29LdQdzC8/bGPXiJgL0xwTiR8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657849911; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=KqVgbKL58fICMMupSzhi4BVnkjvhrDy31BRLjT8Vkws=; b=MaClH7FpHVAewFS9d+oplXzXCbVu4SWTG2J9qEYYbmzjyXT6TCDYhMeb2phB/xv+G0kwAIpNnc+jTy7N61124QDXdPeWBarHiSx/0hyjAve2UwnxfA9Vk/S+QkDaCqGal8kiJkun9VUXiILVzh9LtVvqVLR9lYOKAeJgce5A8uk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91393+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1657849911962382.71667629690285; Thu, 14 Jul 2022 18:51:51 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id WUSqYY1788612x2pGmgGjRjV; Thu, 14 Jul 2022 18:51:50 -0700 X-Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web10.1787.1657849910133261959 for ; Thu, 14 Jul 2022 18:51:50 -0700 X-IronPort-AV: E=McAfee;i="6400,9594,10408"; a="284434426" X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="284434426" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:37 -0700 X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="923318673" X-Received: from guominji-mobl1.ccr.corp.intel.com ([10.238.11.184]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:35 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Jian J Wang , Liming Gao , Zhichao Gao , Ray Ni Subject: [edk2-devel] [Patch v2 07/11] MdeModulePkg/ConSplitterDxe: Remove All UGA Support Date: Fri, 15 Jul 2022 09:51:02 +0800 Message-Id: <20220715015106.1553-8-guomin.jiang@intel.com> In-Reply-To: <20220715015106.1553-1-guomin.jiang@intel.com> References: <20220715015106.1553-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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: ajAnnWvktRwQ1xCXFQ596lBIx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1657849910; bh=DlrbmYubehsYKxgmUNsaestnnZzorbybsWhBeYOLUx8=; h=Cc:Date:From:Reply-To:Subject:To; b=Fm59iUL47lKELPBdGxtx4gcqPKUIjdY55c4NVWIOGsW3X1KK0vnVS0uEMtbjq/sm4Ii WV4kZXoLXxqQ57fO8c7kvBXN14+xrH5WRadGolZz9Td3JEhuBTAtUeIda6xDx7ssdU5Kx ZMf+tSgsAmZr5SUb1+CvJUruWjCL1dUERVk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1657849913957100003 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. Remove All UGA Support in ConSplitterDxe component. Signed-off-by: Guomin Jiang Cc: Jian J Wang Cc: Liming Gao Cc: Zhichao Gao Cc: Ray Ni --- .../Console/ConSplitterDxe/ConSplitter.c | 405 +++--------------- .../Console/ConSplitterDxe/ConSplitter.h | 138 +----- .../Console/ConSplitterDxe/ConSplitterDxe.inf | 17 +- .../Console/ConSplitterDxe/ConSplitterDxe.uni | 12 +- .../ConSplitterDxe/ConSplitterGraphics.c | 310 +------------- 5 files changed, 80 insertions(+), 802 deletions(-) diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/= MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c index 8b5e62e3a883..663fccff046d 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c @@ -16,7 +16,7 @@ never removed. Such design ensures system function well during none cons= ole device situation. =20 -Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
(C) Copyright 2016 Hewlett Packard Enterprise Development LP
SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -107,15 +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 mUgaDrawProtocolTempl= ate =3D { - ConSplitterUgaDrawGetMode, - ConSplitterUgaDrawSetMode, - ConSplitterUgaDrawBlt -}; - // // Graphics Output Protocol Private Data template // @@ -153,16 +144,6 @@ GLOBAL_REMOVE_IF_UNREFERENCED TEXT_OUT_SPLITTER_PRIVAT= E_DATA mConOut =3D { FALSE, }, =20 - { - NULL, - NULL, - NULL - }, - 0, - 0, - 0, - 0, - { NULL, NULL, @@ -171,7 +152,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, @@ -209,16 +189,6 @@ GLOBAL_REMOVE_IF_UNREFERENCED TEXT_OUT_SPLITTER_PRIVAT= E_DATA mStdErr =3D { FALSE, }, =20 - { - NULL, - NULL, - NULL - }, - 0, - 0, - 0, - 0, - { NULL, NULL, @@ -227,7 +197,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 +391,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 if need. =20 @param[in] ImageHandle The firmware allocated handle for the EFI imag= e. @param[in] SystemTable A pointer to the EFI System Table. @@ -493,14 +462,6 @@ ConSplitterDriverEntry ( ); ASSERT_EFI_ERROR (Status); =20 - // - // Either Graphics Output protocol or UGA Draw protocol must be supporte= d. - // - ASSERT ( - FeaturePcdGet (PcdConOutGopSupport) || - FeaturePcdGet (PcdConOutUgaSupport) - ); - // // The driver creates virtual handles for ConIn, ConOut, StdErr. // The virtual handles will always exist even if no console exist in the @@ -757,13 +718,7 @@ 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)); - } + CopyMem (&ConOutPrivate->GraphicsOutput, &mGraphicsOutputProtocolTemplat= e, sizeof (EFI_GRAPHICS_OUTPUT_PROTOCOL)); =20 // // Initialize console output splitter's private data. @@ -806,56 +761,47 @@ ConSplitterTextOutConstructor ( ConOutPrivate->TextOutQueryData[0].Rows =3D 25; TextOutSetMode (ConOutPrivate, 0); =20 - if (FeaturePcdGet (PcdConOutUgaSupport)) { - // - // Setup the UgaDraw to 800 x 600 x 32 bits per pixel, 60Hz. - // - ConSplitterUgaDrawSetMode (&ConOutPrivate->UgaDraw, 800, 600, 32, 60); + // + // 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; } =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; - } + if ((ConOutPrivate->GraphicsOutput.Mode->Info =3D AllocateZeroPool (size= of (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION))) =3D=3D NULL) { + return EFI_OUT_OF_RESOURCES; + } =20 - // - // 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; - } + // + // 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; + } =20 - Info =3D &ConOutPrivate->GraphicsOutputModeBuffe= r[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); + 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 - // - // 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; } @@ -1332,12 +1278,9 @@ ConSplitterConOutDriverBindingStart ( IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath ) { - 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; + EFI_STATUS Status; + EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *TextOut; + EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; =20 // // Start ConSplitter on ControllerHandle, and create the virtual @@ -1356,7 +1299,6 @@ ConSplitterConOutDriverBindingStart ( } =20 GraphicsOutput =3D NULL; - UgaDraw =3D NULL; // // Try to Open Graphics Output protocol // @@ -1369,20 +1311,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. @@ -1393,38 +1321,9 @@ 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_INFORMATION= )); - - 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 - ); - } - } - return Status; } =20 @@ -1477,7 +1376,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_LIG= HTGRAY, EFI_BLACK)); =20 return Status; @@ -2737,7 +2636,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. @@ -2746,8 +2644,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; @@ -2762,12 +2659,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 @@ -2775,15 +2668,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; - } - if (GraphicsOutput !=3D NULL) { if (Private->CurrentNumberOfGraphicsOutput =3D=3D 0) { // @@ -2937,51 +2821,12 @@ 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 CurrentGraphicsOutputMo= de->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++; } =20 - if (UgaDraw !=3D NULL) { - Private->CurrentNumberOfUgaDraw++; - } - // // Force GraphicsOutput mode to be set, // @@ -3130,7 +2975,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. @@ -3140,21 +2984,14 @@ 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; - EFI_STATUS DeviceStatus; + EFI_STATUS Status; + UINTN CurrentNumOfConsoles; + INT32 MaxMode; + TEXT_OUT_AND_GOP_DATA *TextAndGop; + EFI_STATUS DeviceStatus; =20 Status =3D EFI_SUCCESS; CurrentNumOfConsoles =3D Private->CurrentNumberOfConsoles; @@ -3186,7 +3023,6 @@ ConSplitterTextOutAddDevice ( =20 TextAndGop->TextOut =3D TextOut; TextAndGop->GraphicsOutput =3D GraphicsOutput; - TextAndGop->UgaDraw =3D UgaDraw; =20 if (CurrentNumOfConsoles =3D=3D 0) { // @@ -3215,101 +3051,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 (!EFI_ERROR (DeviceStatus)) { // - // If UGA is produced by Consplitter + // Graphics Output Protocol is installed + // on virtual handle. // - 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= )); - - 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 - ); - } - } - } - - if (((!EFI_ERROR (DeviceStatus)) || (!EFI_ERROR (Status))) && - ((Private->CurrentNumberOfGraphicsOutput + Private->CurrentNumberOfU= gaDraw) =3D=3D 1)) - { - if (!FeaturePcdGet (PcdConOutGopSupport)) { - // - // 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 - // on virtual handle. - // - Status =3D gBS->InstallMultipleProtocolInterfaces ( - &mConOut.VirtualHandle, - &gEfiGraphicsOutputProtocolGuid, - &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 - ); - } + Status =3D gBS->InstallMultipleProtocolInterfaces ( + &mConOut.VirtualHandle, + &gEfiGraphicsOutputProtocolGuid, + &mConOut.GraphicsOutput, + NULL + ); } =20 // @@ -3353,10 +3109,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--; } @@ -3377,33 +3129,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 a1fe74726058..15e4e913638e 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h @@ -1,7 +1,7 @@ /** @file Private data structures for the Console Splitter driver =20 -Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -21,7 +21,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include #include -#include =20 #include #include @@ -182,7 +181,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 @@ -195,16 +193,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; @@ -230,13 +221,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, \ @@ -254,7 +238,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. @@ -1202,7 +1186,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. @@ -1212,8 +1195,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 /** @@ -1848,119 +1830,7 @@ ConSplitterGraphicsOutputBlt ( IN UINTN DestinationY, IN UINTN Width, IN UINTN Height, - IN UINTN Delta OPTIONAL - ); - -/** - 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 occurred 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 + IN UINTN Delta OPTIONAL ); =20 /** diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.i= nf b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf index 9aa1dade752a..7e3df4b013e9 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf @@ -3,14 +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. +# It always consumes Graphics Output protocol which is produced by display= device # -# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -92,14 +87,6 @@ ## SOMETIMES_PRODUCES ## SOMETIMES_CONSUMES gEfiGraphicsOutputProtocolGuid - ## SOMETIMES_PRODUCES - ## SOMETIMES_CONSUMES - gEfiUgaDrawProtocolGuid - -[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..902ffd5fc2ec 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni @@ -3,14 +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. +// 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 - 2022, Intel Corporation. All rights reserved.
// // SPDX-License-Identifier: BSD-2-Clause-Patent // @@ -19,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 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. It always consumes Graphics Output protocol, which is produced by d= isplay device." diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraph= ics.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c index 64ad567a6d7d..09469b621741 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c @@ -1,7 +1,7 @@ /** @file Support for Graphics output spliter. =20 -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 =20 @@ -117,7 +117,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; @@ -157,20 +156,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 @@ -261,7 +246,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 EfiGraphicsOutputB= ltOperationMax)) { return EFI_INVALID_PARAMETER; @@ -298,298 +282,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)Numb= erIndex, &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)NumberIn= dex); - 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 occurred 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 *)BltBuffe= r, - (EFI_GRAPHICS_OUTPUT_BLT_OPERATION)BltOpe= ration, - 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 (= PcdUgaConsumeSupport)) { - 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.26.2.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 (#91393): https://edk2.groups.io/g/devel/message/91393 Mute This Topic: https://groups.io/mt/92393227/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 Fri May 10 21:32:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+91389+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91389+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1657849901; cv=none; d=zohomail.com; s=zohoarc; b=G7of4ZJBJJiA2rBf0DevNSPqy1yT3TIMAq9oGmiS5KHhOh6kNZhFEVh0apuXW1aJ2o0nOwMEW/Y84D4LpsyO3PWDQZPOeOv1SXhXN5NgmeM26mZABdr2vQ2ZfPk5jV1uvXc+5Mg9OAEC7BBc51CIA0kEpvj/oj/30lAZ20eF4Uo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657849901; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=FycwIKHwQMoCRn0luIBkmxBznSUU9H21lvBjBB6f2EY=; b=S8E5to/82A5c5AjxLzN/wRQ1Tc8eUzAMQv/y+Q4s7NAzsrSFTHfavTbt5qCyflUT2w18Q6u7/fkY7D2ScUz4KZmJKoOxDRapBlfi1COWPi3puhA7ksMbKJ03g5z1Bswx1Tr84R+kjn6QjObKG5W76L3hW6m0R51Sh2MBI/mQy5Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91389+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1657849901492252.7057998649825; Thu, 14 Jul 2022 18:51:41 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id FmypYY1788612xeu1RE4Rdwy; Thu, 14 Jul 2022 18:51:41 -0700 X-Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.1859.1657849899870939809 for ; Thu, 14 Jul 2022 18:51:40 -0700 X-IronPort-AV: E=McAfee;i="6400,9594,10408"; a="349642193" X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="349642193" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:39 -0700 X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="923318680" X-Received: from guominji-mobl1.ccr.corp.intel.com ([10.238.11.184]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:37 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Jian J Wang , Liming Gao , Zhichao Gao , Ray Ni , Dandan Bi , Eric Dong Subject: [edk2-devel] [Patch v2 08/11] MdeModulePkg/GraphicsConsoleDxe: Remove All UGA Support Date: Fri, 15 Jul 2022 09:51:03 +0800 Message-Id: <20220715015106.1553-9-guomin.jiang@intel.com> In-Reply-To: <20220715015106.1553-1-guomin.jiang@intel.com> References: <20220715015106.1553-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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: EGwojkS4IsJqtzkDmhpTj4Ffx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1657849901; bh=dREiwKNI055IoOySlee9FB5lZXblT+Pz7TsofWRsHFE=; h=Cc:Date:From:Reply-To:Subject:To; b=QcHLV7DDDQgbOONDheJfhRQufJ5qOFc7AVkvYJrONKcO9PFkyZk8k1otUkA9f7SAnqT j1SZBeQycsdbDA7OLxeg+2DAOLLFsgvsNrDHHQxp9N/W0+Waw2ydJ7oOFTiy1skIYIZPE StchdIInqaAEKNJXzWR2yhQLNO9pHwKsqsQ= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1657849902019100002 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. Signed-off-by: Guomin Jiang Cc: Jian J Wang Cc: Liming Gao Cc: Zhichao Gao Cc: Ray Ni Cc: Dandan Bi Cc: Eric Dong --- .../GraphicsConsoleDxe/GraphicsConsole.c | 300 +----------------- .../GraphicsConsoleDxe/GraphicsConsole.h | 21 +- .../GraphicsConsoleDxe/GraphicsConsoleDxe.inf | 8 +- .../GraphicsConsoleDxe/GraphicsConsoleDxe.uni | 6 +- MdeModulePkg/Universal/HiiDatabaseDxe/Image.c | 4 +- 5 files changed, 23 insertions(+), 316 deletions(-) diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsCons= ole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c index b895dafedeaa..facb813276cd 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, @@ -104,9 +103,8 @@ EFI_DRIVER_BINDING_PROTOCOL gGraphicsConsoleDriverBind= ing =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. @@ -127,11 +125,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 // @@ -143,21 +139,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; } @@ -202,13 +183,6 @@ Error: This->DriverBindingHandle, Controller ); - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - gBS->CloseProtocol ( - Controller, - &gEfiUgaDrawProtocolGuid, - This->DriverBindingHandle, - Controller - ); } =20 return Status; @@ -369,9 +343,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 @@ -394,8 +367,6 @@ GraphicsConsoleControllerDriverStart ( GRAPHICS_CONSOLE_DEV *Private; UINT32 HorizontalResolution; UINT32 VerticalResolution; - UINT32 ColorDepth; - UINT32 RefreshRate; UINT32 ModeIndex; UINTN MaxMode; UINT32 ModeNumber; @@ -432,18 +403,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; } @@ -534,43 +493,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 ((DEBUG_INFO, "GraphicsConsole video resolution %d x %d\n", Horizo= ntalResolution, VerticalResolution)); @@ -638,7 +560,7 @@ GraphicsConsoleControllerDriverStart ( Error: if (EFI_ERROR (Status)) { // - // Close the GOP and UGA Draw Protocol + // Close the GOP // if (Private->GraphicsOutput !=3D NULL) { gBS->CloseProtocol ( @@ -647,13 +569,6 @@ Error: This->DriverBindingHandle, Controller ); - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - gBS->CloseProtocol ( - Controller, - &gEfiUgaDrawProtocolGuid, - This->DriverBindingHandle, - Controller - ); } =20 if (Private->LineBuffer !=3D NULL) { @@ -675,9 +590,7 @@ Error: =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 @@ -726,7 +639,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 ( @@ -735,13 +648,6 @@ GraphicsConsoleControllerDriverStop ( This->DriverBindingHandle, Controller ); - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - gBS->CloseProtocol ( - Controller, - &gEfiUgaDrawProtocolGuid, - This->DriverBindingHandle, - Controller - ); } =20 if (Private->LineBuffer !=3D NULL) { @@ -933,7 +839,6 @@ GraphicsConsoleConOutOutputString ( { GRAPHICS_CONSOLE_DEV *Private; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; INTN Mode; UINTN MaxColumn; UINTN MaxRow; @@ -967,7 +872,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; @@ -1055,38 +959,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++; @@ -1320,19 +1192,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 @@ -1366,7 +1232,7 @@ GraphicsConsoleConOutSetMode ( } =20 // - // 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); @@ -1422,51 +1288,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->GopWidt= h) || (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 // @@ -1558,7 +1379,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; @@ -1574,7 +1394,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); @@ -1591,19 +1410,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; } @@ -1764,7 +1570,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 @@ -1781,9 +1587,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_OUTP= UT)); @@ -1835,63 +1638,6 @@ DrawUnicodeWeightAtCursorN ( NULL, NULL ); - } 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 + Priv= ate->ModeData[This->Mode->Mode].DeltaX, - This->Mode->CursorRow * EFI_GLYPH_HEIGHT + Privat= e->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; } @@ -1934,7 +1680,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]; @@ -1949,7 +1694,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. @@ -1972,19 +1716,6 @@ FlushCursor ( EFI_GLYPH_HEIGHT, EFI_GLYPH_WIDTH * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PI= XEL) ); - } 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); @@ -2013,19 +1744,6 @@ FlushCursor ( EFI_GLYPH_HEIGHT, EFI_GLYPH_WIDTH * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PI= XEL) ); - } 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 e4abad40f49a..83f4c58df508 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h @@ -1,7 +1,7 @@ /** @file Header file for GraphicsConsole driver. =20 -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -12,7 +12,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include #include -#include #include #include #include @@ -59,7 +58,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; @@ -417,9 +415,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 UGADr= aw - 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. @@ -439,9 +436,8 @@ GraphicsConsoleControllerDriverSupported ( ); =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 @@ -462,9 +458,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 @@ -526,8 +520,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..85cd91f293f0 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.= inf +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.= inf @@ -2,9 +2,9 @@ # 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.
+# Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # # @@ -53,15 +53,11 @@ 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..7336d5e6e5d5 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.= uni +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.= uni @@ -2,9 +2,9 @@ // 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.
+// Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
// // SPDX-License-Identifier: BSD-2-Clause-Patent // @@ -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 b5b962596968..50c1a5b74d74 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c @@ -2,7 +2,7 @@ Implementation for EFI_HII_IMAGE_PROTOCOL. =20 =20 -Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2022, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -1401,7 +1401,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.26.2.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 (#91389): https://edk2.groups.io/g/devel/message/91389 Mute This Topic: https://groups.io/mt/92393221/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 Fri May 10 21:32:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+91390+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91390+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1657849902; cv=none; d=zohomail.com; s=zohoarc; b=Gxj4evtcApsVcdnoy9UEq7PKWLU3OA/CNRbbDSNAFYBTvJffJmpNSMLf7IbAyuqXbxWRTwdh4AE4XSkRTFnnY9vKUOdGdB4oIVS4yHS519/OQ1sG1bAMZLwZqDFbK2Ho5Lxvjonw0AS8ZvcW5fSgUtlPCWT66+w3EKpVrJqzB8E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657849902; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=lCjPei+3s/XtnVkU1Ts14zAbSnzWUKijmc+ZUwCfusk=; b=nXfwrfK2pAVo0xFELOq5dX7CTvZWvWfA8H43az5hanje3n2j4ZYKGFuoaPINLrhwYpmdeaDvryE8inRmnb8ueZdHSoXD3kosg/FWHm6VFPMGZxJBiZR1T42P15xcNa4NxTftYI5MX+4k8WX2zOX6BNvbNOLqWwKlJEo9mXrgf48= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91390+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1657849902361389.09879168607426; Thu, 14 Jul 2022 18:51:42 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id SkfpYY1788612xHZzgNl0x0i; Thu, 14 Jul 2022 18:51:42 -0700 X-Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.1859.1657849899870939809 for ; Thu, 14 Jul 2022 18:51:41 -0700 X-IronPort-AV: E=McAfee;i="6400,9594,10408"; a="349642195" X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="349642195" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:41 -0700 X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="923318684" X-Received: from guominji-mobl1.ccr.corp.intel.com ([10.238.11.184]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:39 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Jian J Wang , Liming Gao , Zhichao Gao , Ray Ni , Hao A Wu Subject: [edk2-devel] [Patch v2 09/11] MdeModulePkg: Remove All UGA Support Date: Fri, 15 Jul 2022 09:51:04 +0800 Message-Id: <20220715015106.1553-10-guomin.jiang@intel.com> In-Reply-To: <20220715015106.1553-1-guomin.jiang@intel.com> References: <20220715015106.1553-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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: ltoKAQXalCjQel6lYPwQ4JWQx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1657849902; bh=mxQ/kwA2dGqDyPKaeUT780KivL/R+W78sAEDoP8TJEk=; h=Cc:Date:From:Reply-To:Subject:To; b=lqken75wx0rKSQr0zm9RacaffD4/PghAvwJDsC0TYU3micDCi/gTJMzYZkJcys8wdZY cwThPlf1rGf/7BWJq65jtQ5zN9S9PZ2qv8HgSGmX/T9cJIvkHt6gRiWJXKgpbdxw+ixXx HnX4rtEcL2PDsdE3HIQhOPOVpdPO4FW/c48= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1657849903873100007 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. Remove the PcdConOutGopSupport definition. Signed-off-by: Guomin Jiang Cc: Jian J Wang Cc: Liming Gao Cc: Zhichao Gao Cc: Ray Ni Cc: Hao A Wu --- MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c | 4 +- MdeModulePkg/Include/Library/BootLogoLib.h | 4 +- .../Library/BootLogoLib/BootLogoLib.c | 228 +++++------------- .../Library/BootLogoLib/BootLogoLib.inf | 6 +- 4 files changed, 61 insertions(+), 181 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c b/MdeModulePkg/Bus/Pci= /PciBusDxe/PciBus.c index 337b2090d98e..50ce9a9eaff2 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c @@ -8,7 +8,7 @@ PCI Root Bridges. So it means platform needs install PCI Root Bridge IO = protocol for each PCI Root Bus and install PCI Host Bridge Resource Allocation Protocol. =20 -Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -49,7 +49,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_PCI_HOTPLUG_REQUEST_PRO= TOCOL mPciHotPlugReque 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 2d6209a2789b..854d5b636713 100644 --- a/MdeModulePkg/Include/Library/BootLogoLib.h +++ b/MdeModulePkg/Include/Library/BootLogoLib.h @@ -2,7 +2,7 @@ This library is only intended to be used by PlatformBootManagerLib to show progress bar and LOGO. =20 -Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2011 - 2022, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -26,7 +26,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 Graphic device 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 478ec2d40e2b..4a823912e014 100644 --- a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.c +++ b/MdeModulePkg/Library/BootLogoLib/BootLogoLib.c @@ -2,7 +2,7 @@ This library is only intended to be used by PlatformBootManagerLib to show progress bar and LOGO. =20 -Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2011 - 2022, Intel Corporation. All rights reserved.
Copyright (c) 2016, Microsoft Corporation
SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -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; - } - } =20 if (EFI_ERROR (Status)) { return EFI_UNSUPPORTED; @@ -109,16 +94,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; @@ -206,34 +183,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. @@ -307,33 +268,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_B= LT_PIXEL) - ); - } 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)) { @@ -368,7 +314,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 Graphic devices are back in text mode and synced= up. =20 **/ EFI_STATUS @@ -411,11 +357,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; @@ -428,40 +371,14 @@ BootLogoUpdateProgress ( return EFI_INVALID_PARAMETER; } =20 - UgaDraw =3D NULL; - Status =3D gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiGraphicsOut= putProtocolGuid, (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; - } - } + Status =3D gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiGraphicsOutp= utProtocolGuid, (VOID **)&GraphicsOutput); =20 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; @@ -477,35 +394,18 @@ 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_P= IXEL) + ); } =20 // @@ -513,35 +413,19 @@ BootLogoUpdateProgress ( // 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_OUTPU= T_BLT_PIXEL) - ); - } 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_PIXEL) + ); } =20 PrintXY ( diff --git a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf b/MdeModulePk= g/Library/BootLogoLib/BootLogoLib.inf index 7d50f2dfa3ab..f59e4e0705e7 100644 --- a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf +++ b/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf @@ -2,7 +2,7 @@ # This library is only intended to be used by PlatformBootManagerLib # to show progress bar and logo. # -# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2011 - 2022, Intel Corporation. All rights reserved.
# Copyright (c) 2016, Microsoft Corporation
# SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -42,11 +42,7 @@ =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.26.2.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 (#91390): https://edk2.groups.io/g/devel/message/91390 Mute This Topic: https://groups.io/mt/92393223/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 Fri May 10 21:32:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+91391+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91391+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1657849903; cv=none; d=zohomail.com; s=zohoarc; b=UJp6HKQzY7zMzpmLgALKWAcpLEQjEmvfs0dzi5X8u0DZ2Aueet1Q89FFQqU84s12tzTLBXnHtltN/jmsDQ1Gb2P7y4lrZ7nIrxxQ3Rb04TxeRRZ6zoWiqwuvTG8MSahQhmvMbn89yfmsc4LwjL5fehfBiO0IlT8jWm4U0/c4aj8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657849903; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=e3Uqk47AYkNbb0LJY3rJIavYnWR+f3EVQmSPhoZnd0o=; b=VJku+j4P/b3sMGGU7fzH72i3WsEuda4Fa50D+VN7GyA2NrZQn5+h/Gnd7NyJiore2e+7SaNsXZLJLYYOjskIYOVoCnRTYUL2IT1x4GvnAgMKa8JnqlO6FeULvLzm6gACZ7yfCfSrr7sjVhCnaw+EdxiBYQ/vMxZ8cxZqJ/iFsWk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91391+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1657849903706795.2380913775895; Thu, 14 Jul 2022 18:51:43 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id prCIYY1788612xmC8um6hP3G; Thu, 14 Jul 2022 18:51:43 -0700 X-Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.1859.1657849899870939809 for ; Thu, 14 Jul 2022 18:51:42 -0700 X-IronPort-AV: E=McAfee;i="6400,9594,10408"; a="349642199" X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="349642199" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:42 -0700 X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="923318688" X-Received: from guominji-mobl1.ccr.corp.intel.com ([10.238.11.184]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:41 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao , Yuwei Chen Subject: [edk2-devel] [Patch v2 10/11] BaseTools: Remove all UGA support Date: Fri, 15 Jul 2022 09:51:05 +0800 Message-Id: <20220715015106.1553-11-guomin.jiang@intel.com> In-Reply-To: <20220715015106.1553-1-guomin.jiang@intel.com> References: <20220715015106.1553-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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: gkXXmbD4yhPt5cgg2nlzu60Zx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1657849903; bh=+UsatD2HgaMNwVk8+Wsl0XExU1GpB8s7ZVbltCsf93A=; h=Cc:Date:From:Reply-To:Subject:To; b=t5W6sY4nUucbeCRm2UUWA6Iol/mLp452pvIFHL0XjeyKeERbaSYZ/l+gjxvfQ3yFCfN BXbIk6YviAIG6z2c5fSQp+STuRaGOW4bd7ZNd+GfIoG3VyTFurChZvoyyiqDVdNSGkjbx IyPY/71UbEpgurLppNV5geoEcYzYXHE2DqI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1657849905866100013 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2368 Remove UGA code in BaseTools Signed-off-by: Guomin Jiang Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Reviewed-by: Bob Feng --- .../Source/C/Include/Protocol/HiiFramework.h | 53 +----- BaseTools/Source/C/Include/Protocol/UgaDraw.h | 161 ------------------ 2 files changed, 1 insertion(+), 213 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..4c651f89e0eb 100644 --- a/BaseTools/Source/C/Include/Protocol/HiiFramework.h +++ b/BaseTools/Source/C/Include/Protocol/HiiFramework.h @@ -6,7 +6,7 @@ @par Revision Reference: This protocol is defined in HII spec 0.92. =20 - Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2007 - 2022, Intel Corporation. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -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.26.2.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 (#91391): https://edk2.groups.io/g/devel/message/91391 Mute This Topic: https://groups.io/mt/92393224/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 Fri May 10 21:32:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+91392+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91392+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1657849905; cv=none; d=zohomail.com; s=zohoarc; b=HCN4cQhrPjBPevLUoLf07fU+xMHfPl8oV8ptbeRR9SNREuzXLIArg+26+ZzeTqo3jooe5q7tX1dtxtyP0B6vxK7YZ+qb941hv9Da4rE+XDlMrhheRovvJZ/aoV3tuGfU06lzxJVVVOGFN8soX3xYvzM6cvVbMfWKYhgjqMcD1e4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657849905; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=/aR92VL6g9sgumKkeTeZKkl7bI8eVjV12XhvQsqXgYc=; b=QdTc+7JAYbdOURuAv7L7rnE9a9KyWfHH0on8UmAXNkZSK895LDTnyg9mAA6HS2962DBZj9x9BWhH2qRWhvTVLijthot0Gr9myQNLBunTtvm5rS/SGBl5xWFOAq18S3kgB/fJj9yddvghHkZcFC91ZHyDPLj8lR4pNAvvNMF0ZKw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91392+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1657849905249656.9392629129054; Thu, 14 Jul 2022 18:51:45 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id R7zhYY1788612xlcmt8DEDTa; Thu, 14 Jul 2022 18:51:44 -0700 X-Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.1859.1657849899870939809 for ; Thu, 14 Jul 2022 18:51:44 -0700 X-IronPort-AV: E=McAfee;i="6400,9594,10408"; a="349642202" X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="349642202" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:43 -0700 X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="923318695" X-Received: from guominji-mobl1.ccr.corp.intel.com ([10.238.11.184]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 18:51:42 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: Michael D Kinney , Liming Gao , Zhiguang Liu Subject: [edk2-devel] [Patch v2 11/11] MdePkg/UefiLib: Remove all UGA support Date: Fri, 15 Jul 2022 09:51:06 +0800 Message-Id: <20220715015106.1553-12-guomin.jiang@intel.com> In-Reply-To: <20220715015106.1553-1-guomin.jiang@intel.com> References: <20220715015106.1553-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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: WZjantSn17Uhxb8Bb8JudD0Bx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1657849904; bh=dFf0K3JengiS2sXcVVamelVMWTnjJ7cuDUl3zD/Y9PY=; h=Cc:Date:From:Reply-To:Subject:To; b=D1LYFVIbiLfsu2FeyYJ0AKMf/BcCUIcIWUgklG7JJWJrnaWhZ/XnsGO+vE87+4Soa8o zpe+c5uh7OvakBGKuwIynGmHX3CoAZ+5RBVoWJwbl5el0cCNQaqSAn8vU3bb8OfZdT56P 4a60usJ6H8bTG0/Dl9FVuLV47G8r5I6TjEk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1657849905873100014 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2368 Remove all UGA code in MdePkg except the definition The reason why keep definition is because downstream need it to pass build. It will be removed when all downstream remove UGA support Signed-off-by: Guomin Jiang Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Reviewed-by: Michael D Kinney --- MdePkg/Library/UefiLib/UefiLib.inf | 4 +- MdePkg/Library/UefiLib/UefiLibInternal.h | 3 +- MdePkg/Library/UefiLib/UefiLibPrint.c | 91 +----------------------- MdePkg/MdePkg.dsc | 3 - 4 files changed, 3 insertions(+), 98 deletions(-) diff --git a/MdePkg/Library/UefiLib/UefiLib.inf b/MdePkg/Library/UefiLib/Ue= fiLib.inf index 01ed92092da2..ac9d68907261 100644 --- a/MdePkg/Library/UefiLib/UefiLib.inf +++ b/MdePkg/Library/UefiLib/UefiLib.inf @@ -7,7 +7,7 @@ # EFI Driver Model related protocols, manage Unicode string tables for UE= FI Drivers, # and print messages on the console output and standard error devices. # -# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2022, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -67,7 +67,6 @@ 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 @@ 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 4365282cf213..be5c9ddcdde8 100644 --- a/MdePkg/Library/UefiLib/UefiLibInternal.h +++ b/MdePkg/Library/UefiLib/UefiLibInternal.h @@ -1,7 +1,7 @@ /** @file Internal include file for UefiLib. =20 - Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2007 - 2022, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ =20 @@ -18,7 +18,6 @@ #include #include #include -#include #include =20 #include diff --git a/MdePkg/Library/UefiLib/UefiLibPrint.c b/MdePkg/Library/UefiLib= /UefiLibPrint.c index 39edeb7283dd..2451775aeb90 100644 --- a/MdePkg/Library/UefiLib/UefiLibPrint.c +++ b/MdePkg/Library/UefiLib/UefiLibPrint.c @@ -2,7 +2,7 @@ Mde UEFI library API implementation. Print to StdErr or ConOut defined in EFI_SYSTEM_TABLE =20 - Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2007 - 2022, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -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; @@ -374,20 +368,6 @@ InternalPrintGraphic ( (VOID **)&GraphicsOutput ); =20 - 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; } @@ -405,8 +385,6 @@ InternalPrintGraphic ( if (GraphicsOutput !=3D NULL) { HorizontalResolution =3D GraphicsOutput->Mode->Info->HorizontalResolut= ion; VerticalResolution =3D GraphicsOutput->Mode->Info->VerticalResolutio= n; - } else if ((UgaDraw !=3D NULL) && FeaturePcdGet (PcdUgaConsumeSupport)) { - UgaDraw->GetMode (UgaDraw, &HorizontalResolution, &VerticalResolution,= &ColorDepth, &RefreshRate); } else { goto Error; } @@ -466,73 +444,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->Heig= ht * 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_CLIP= | - EFI_HII_OUT_FLAG_CLIP_CLEAN_X | EFI_HII_OUT_FLAG_C= LIP_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.dsc b/MdePkg/MdePkg.dsc index 3d8874e64782..e67d4716df21 100644 --- a/MdePkg/MdePkg.dsc +++ b/MdePkg/MdePkg.dsc @@ -23,9 +23,6 @@ =20 !include MdePkg/MdeLibs.dsc.inc =20 -[PcdsFeatureFlag] - gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport|TRUE - [PcdsFixedAtBuild] gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0f gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000 --=20 2.26.2.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 (#91392): https://edk2.groups.io/g/devel/message/91392 Mute This Topic: https://groups.io/mt/92393226/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-