From nobody Sun May 5 07:06:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+58866+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+58866+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588929391; cv=none; d=zohomail.com; s=zohoarc; b=ZhBw0gqUCrzqKrpgnpuxm/7EC+LkqYLzF4i5mDEgMxHe8iv7shxBPBSKmC06xKCcImKL/psVMh+YHtMqGNY4CqMhzv5I5MEFySGbGGSxx+dZiGMrAe1LAfrr8lqqaFzO6ILcinGApz7oITbnsLkghvuSK8lkD3INfIkiiFx34i4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588929391; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=ciq8xxtSWzlVadZ3MgNEEoeXdoX172SXi+QE+JGDiRQ=; b=WXTeQu7rtdMexkgjAgML761gRj0MmDVZoxa2LU4ur3hBFxA+RiWGW/FcZUVkz+eeFIA0P4hlqTTWr4r2DYCD4sIG6N5f2e5rtQCFacd7e1PfF+6Uh41xyZYPOUxy7BPah2uEjmyCoymKpdH5qSp1m9la7Huz0r+KNaKVAW/QqyM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+58866+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 15889293911511011.9238403736547; Fri, 8 May 2020 02:16:31 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id NCfMYY1788612xvknkPn3Jp9; Fri, 08 May 2020 02:16:30 -0700 X-Received: from mga17.intel.com (mga17.intel.com []) by mx.groups.io with SMTP id smtpd.web10.7259.1588929389103436728 for ; Fri, 08 May 2020 02:16:30 -0700 IronPort-SDR: gAZIBJ0uJdGuXASlF7oCENdC1hD8eYpu5ZO1xjCtTuXqhMNg0vQ7/Au27ySn+FwlZVWgvyQUn7 D5fqUIuTLfOg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2020 02:16:30 -0700 IronPort-SDR: 4feJ5JbD0zFavZ2NcjxWCpI3kf45p3LNcKYlGyzx8WkKi25Yib5l7EIE564X4nNSU5+qM4x64Y GfBr3H3NMImw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="285316395" X-Received: from guominji-mobl.ccr.corp.intel.com ([10.238.4.95]) by fmsmga004.fm.intel.com with ESMTP; 08 May 2020 02:16:28 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Agyeman Prince , Zailiang Sun , Yi Qian , Guomin Jiang Subject: [edk2-devel] [edk2-platforms][PATCH] 1/3] Platform/Intel: Remove All UGA Support Date: Fri, 8 May 2020 17:16:19 +0800 Message-Id: <20200508091621.2213-2-guomin.jiang@intel.com> In-Reply-To: <20200508091621.2213-1-guomin.jiang@intel.com> References: <20200508091621.2213-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,guomin.jiang@intel.com X-Gm-Message-State: EHHVz2aXDq4Cusr7JndIXlqdx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588929390; bh=SREqf538DsEsZfiz5t4pa52RW3RCiatxqK+xeVcq5xU=; h=Cc:Date:From:Reply-To:Subject:To; b=df7c8MJzbVV88M3TTyc1vyntK02amhOR0Q5QYL5NVCQQyfdcIj5nklG4IZYbKADBiop VDDPfwV0+rhNly9prP6VpL+R6tR/db1QhJtBDU0rDx4uvS0G6aZ6aja5uMqZA+tF80sqg czjqbaDVUo9Sl7+K+ikKvu4HicQxYEX3FJ0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: GuoMinJ REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2368 Remove all UGA Support in INTEL platform. Cc: Agyeman Prince Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Guomin Jiang --- .../BoardX58Ich10/OpenBoardPkgPcd.dsc | 1 - .../Library/DxeLogoLib/DxeLogoLib.inf | 4 -- .../Library/DxeLogoLib/Logo.c | 43 ------------------- .../DxePlatformBootManagerLib/BdsPlatform.h | 1 - 4 files changed, 49 deletions(-) diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPc= d.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc index cd98d09f0187..5c778d5d08d2 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc @@ -32,7 +32,6 @@ [PcdsFeatureFlag.common] ###################################### gEfiMdeModulePkgTokenSpaceGuid.PcdBrowerGrayOutReadOnlyMenu|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE diff --git a/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/DxeLogoLi= b.inf b/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/DxeLogoLib.inf index ff08c385b3a0..66a102acdd60 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/DxeLogoLib.inf +++ b/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/DxeLogoLib.inf @@ -41,15 +41,11 @@ [Packages] MdeModulePkg/MdeModulePkg.dec SimicsOpenBoardPkg/OpenBoardPkg.dec =20 -[FeaturePcd] - gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport - [Sources] Logo.c =20 [Protocols] gEfiGraphicsOutputProtocolGuid ## SOMETIMES_CONSUMES - gEfiUgaDrawProtocolGuid ## SOMETIMES_CONSUMES gEfiBootLogoProtocolGuid ## SOMETIMES_CONSUMES gEfiUserManagerProtocolGuid ## CONSUMES gEfiOemBadgingProtocolGuid ## CONSUMES diff --git a/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/Logo.c b/= Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/Logo.c index 48a718a90d46..6a98ccfb8a74 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/Logo.c +++ b/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/Logo.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -300,9 +299,6 @@ EnableBootLogo ( UINTN Height; UINTN Width; 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; UINTN NumberOfLogos; @@ -317,18 +313,10 @@ EnableBootLogo ( UINTN NewWidth; UINT64 BufferSize; =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)) { return EFI_UNSUPPORTED; } @@ -351,11 +339,6 @@ EnableBootLogo ( SizeOfX =3D GraphicsOutput->Mode->Info->HorizontalResolution; SizeOfY =3D GraphicsOutput->Mode->Info->VerticalResolution; =20 - } else if (UgaDraw !=3D NULL && FeaturePcdGet (PcdUgaConsumeSupport)) { - Status =3D UgaDraw->GetMode (UgaDraw, &SizeOfX, &SizeOfY, &ColorDepth,= &RefreshRate); - if (EFI_ERROR (Status)) { - return EFI_UNSUPPORTED; - } } else { return EFI_UNSUPPORTED; } @@ -503,19 +486,6 @@ EnableBootLogo ( Height, Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) ); - } else if (UgaDraw !=3D NULL && FeaturePcdGet (PcdUgaConsumeSupport)= ) { - Status =3D UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) Blt, - EfiUgaBltBufferToVideo, - 0, - 0, - (UINTN) DestX, - (UINTN) DestY, - Width, - Height, - Width * sizeof (EFI_UGA_PIXEL) - ); } else { Status =3D EFI_UNSUPPORTED; } @@ -620,19 +590,6 @@ EnableBootLogo ( LogoHeight, LogoWidth * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXE= L) ); - } else if (UgaDraw !=3D NULL && FeaturePcdGet (PcdUgaConsumeSupport)) { - Status =3D UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) LogoBlt, - EfiUgaVideoToBltBuffer, - LogoDestX, - LogoDestY, - 0, - 0, - LogoWidth, - LogoHeight, - LogoWidth * sizeof (EFI_UGA_PIXEL) - ); } else { Status =3D EFI_UNSUPPORTED; } diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManage= rLib/BdsPlatform.h b/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBo= otManagerLib/BdsPlatform.h index 0bdc11bdd824..6cc4e3acf279 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/Bd= sPlatform.h +++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/Bd= sPlatform.h @@ -19,7 +19,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include #include -#include #include #include #include --=20 2.25.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#58866): https://edk2.groups.io/g/devel/message/58866 Mute This Topic: https://groups.io/mt/74069171/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-