* Re: [ed2-platforms][PATCH 1/2] Platform/Intel/SimicsOpenBoardPkg: Remove all UGA support
2022-01-21 0:56 ` [ed2-platforms][PATCH 1/2] Platform/Intel/SimicsOpenBoardPkg: " Guomin Jiang
@ 2022-01-22 1:44 ` Nate DeSimone
2022-01-22 1:49 ` Nate DeSimone
1 sibling, 0 replies; 6+ messages in thread
From: Nate DeSimone @ 2022-01-22 1:44 UTC (permalink / raw)
To: Jiang, Guomin, devel@edk2.groups.io; +Cc: GuoMinJ
Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
-----Original Message-----
From: Jiang, Guomin <guomin.jiang@intel.com>
Sent: Thursday, January 20, 2022 4:57 PM
To: devel@edk2.groups.io
Cc: GuoMinJ <newexplorerj@gmail.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Jiang, Guomin <guomin.jiang@intel.com>
Subject: [ed2-platforms][PATCH 1/2] Platform/Intel/SimicsOpenBoardPkg: Remove all UGA support
From: GuoMinJ <newexplorerj@gmail.com>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2368
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Signed-off-by: Guomin Jiang <guomin.jiang@intel.com>
---
.../BoardX58Ich10/OpenBoardPkgPcd.dsc | 4 +-
.../Library/DxeLogoLib/DxeLogoLib.inf | 6 +--
.../Library/DxeLogoLib/Logo.c | 45 +------------------
3 files changed, 3 insertions(+), 52 deletions(-)
diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc
index 88009b8f1022..9b81726623dc 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc
+++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.ds
+++ c
@@ -1,7 +1,7 @@
## @file
# PCD configuration build description file for the X58Ich10 board.
#
-# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2022, Intel Corporation. All rights reserved.
+<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -31,8 +31,6 @@ [PcdsFeatureFlag.common]
# Edk2 Configuration
######################################
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/DxeLogoLib.inf b/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/DxeLogoLib.inf
index ff08c385b3a0..cd9565e123db 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/DxeLogoLib.inf
+++ b/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/DxeLogoLib.in
+++ f
@@ -6,7 +6,7 @@
# 2) BDS boot device connect interface; # 3) BDS Misc interfaces for mainting boot variable, ouput string, etc.
#
-# Copyright (c) 2007 - 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2007 - 2022 Intel Corporation. All rights reserved.
+<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -41,15 +41,11 @@ [Packages]
MdeModulePkg/MdeModulePkg.dec
SimicsOpenBoardPkg/OpenBoardPkg.dec
-[FeaturePcd]
- gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport
-
[Sources]
Logo.c
[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..9cea5f4665d0 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/Logo.c
+++ b/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/Logo.c
@@ -1,7 +1,7 @@
/** @file
BDS Lib functions which contain all the code to connect console device
- Copyright (c) 2006 - 2019 Intel Corporation. All rights reserved. <BR>
+ Copyright (c) 2006 - 2022 Intel Corporation. All rights reserved.
+ <BR>
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -10,7 +10,6 @@ #include <Protocol/SimpleTextOut.h> #include <OemBadging.h> #include <Protocol/GraphicsOutput.h> -#include <Protocol/UgaDraw.h> #include <Library/BaseLib.h> #include <Library/UefiLib.h> #include <Library/BaseMemoryLib.h> @@ -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;
- UgaDraw = NULL;
//
// Try to open GOP first
//
Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiGraphicsOutputProtocolGuid, (VOID **) &GraphicsOutput);
- if (EFI_ERROR (Status) && FeaturePcdGet (PcdUgaConsumeSupport)) {
- GraphicsOutput = NULL;
- //
- // Open GOP failed, try to open UGA
- //
- Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiUgaDrawProtocolGuid, (VOID **) &UgaDraw);
- }
if (EFI_ERROR (Status)) {
return EFI_UNSUPPORTED;
}
@@ -351,11 +339,6 @@ EnableBootLogo (
SizeOfX = GraphicsOutput->Mode->Info->HorizontalResolution;
SizeOfY = GraphicsOutput->Mode->Info->VerticalResolution;
- } else if (UgaDraw != NULL && FeaturePcdGet (PcdUgaConsumeSupport)) {
- Status = 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 != NULL && FeaturePcdGet (PcdUgaConsumeSupport)) {
- Status = UgaDraw->Blt (
- UgaDraw,
- (EFI_UGA_PIXEL *) Blt,
- EfiUgaBltBufferToVideo,
- 0,
- 0,
- (UINTN) DestX,
- (UINTN) DestY,
- Width,
- Height,
- Width * sizeof (EFI_UGA_PIXEL)
- );
} else {
Status = EFI_UNSUPPORTED;
}
@@ -620,19 +590,6 @@ EnableBootLogo (
LogoHeight,
LogoWidth * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)
);
- } else if (UgaDraw != NULL && FeaturePcdGet (PcdUgaConsumeSupport)) {
- Status = UgaDraw->Blt (
- UgaDraw,
- (EFI_UGA_PIXEL *) LogoBlt,
- EfiUgaVideoToBltBuffer,
- LogoDestX,
- LogoDestY,
- 0,
- 0,
- LogoWidth,
- LogoHeight,
- LogoWidth * sizeof (EFI_UGA_PIXEL)
- );
} else {
Status = EFI_UNSUPPORTED;
}
--
2.30.0.windows.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [ed2-platforms][PATCH 1/2] Platform/Intel/SimicsOpenBoardPkg: Remove all UGA support
2022-01-21 0:56 ` [ed2-platforms][PATCH 1/2] Platform/Intel/SimicsOpenBoardPkg: " Guomin Jiang
2022-01-22 1:44 ` Nate DeSimone
@ 2022-01-22 1:49 ` Nate DeSimone
1 sibling, 0 replies; 6+ messages in thread
From: Nate DeSimone @ 2022-01-22 1:49 UTC (permalink / raw)
To: Jiang, Guomin, devel@edk2.groups.io; +Cc: GuoMinJ
The series has been pushed as 3de8b92~..8eb3b2f
-----Original Message-----
From: Jiang, Guomin <guomin.jiang@intel.com>
Sent: Thursday, January 20, 2022 4:57 PM
To: devel@edk2.groups.io
Cc: GuoMinJ <newexplorerj@gmail.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Jiang, Guomin <guomin.jiang@intel.com>
Subject: [ed2-platforms][PATCH 1/2] Platform/Intel/SimicsOpenBoardPkg: Remove all UGA support
From: GuoMinJ <newexplorerj@gmail.com>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2368
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Signed-off-by: Guomin Jiang <guomin.jiang@intel.com>
---
.../BoardX58Ich10/OpenBoardPkgPcd.dsc | 4 +-
.../Library/DxeLogoLib/DxeLogoLib.inf | 6 +--
.../Library/DxeLogoLib/Logo.c | 45 +------------------
3 files changed, 3 insertions(+), 52 deletions(-)
diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc
index 88009b8f1022..9b81726623dc 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc
+++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.ds
+++ c
@@ -1,7 +1,7 @@
## @file
# PCD configuration build description file for the X58Ich10 board.
#
-# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2022, Intel Corporation. All rights reserved.
+<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -31,8 +31,6 @@ [PcdsFeatureFlag.common]
# Edk2 Configuration
######################################
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/DxeLogoLib.inf b/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/DxeLogoLib.inf
index ff08c385b3a0..cd9565e123db 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/DxeLogoLib.inf
+++ b/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/DxeLogoLib.in
+++ f
@@ -6,7 +6,7 @@
# 2) BDS boot device connect interface; # 3) BDS Misc interfaces for mainting boot variable, ouput string, etc.
#
-# Copyright (c) 2007 - 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2007 - 2022 Intel Corporation. All rights reserved.
+<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -41,15 +41,11 @@ [Packages]
MdeModulePkg/MdeModulePkg.dec
SimicsOpenBoardPkg/OpenBoardPkg.dec
-[FeaturePcd]
- gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport
-
[Sources]
Logo.c
[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..9cea5f4665d0 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/Logo.c
+++ b/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/Logo.c
@@ -1,7 +1,7 @@
/** @file
BDS Lib functions which contain all the code to connect console device
- Copyright (c) 2006 - 2019 Intel Corporation. All rights reserved. <BR>
+ Copyright (c) 2006 - 2022 Intel Corporation. All rights reserved.
+ <BR>
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -10,7 +10,6 @@ #include <Protocol/SimpleTextOut.h> #include <OemBadging.h> #include <Protocol/GraphicsOutput.h> -#include <Protocol/UgaDraw.h> #include <Library/BaseLib.h> #include <Library/UefiLib.h> #include <Library/BaseMemoryLib.h> @@ -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;
- UgaDraw = NULL;
//
// Try to open GOP first
//
Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiGraphicsOutputProtocolGuid, (VOID **) &GraphicsOutput);
- if (EFI_ERROR (Status) && FeaturePcdGet (PcdUgaConsumeSupport)) {
- GraphicsOutput = NULL;
- //
- // Open GOP failed, try to open UGA
- //
- Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiUgaDrawProtocolGuid, (VOID **) &UgaDraw);
- }
if (EFI_ERROR (Status)) {
return EFI_UNSUPPORTED;
}
@@ -351,11 +339,6 @@ EnableBootLogo (
SizeOfX = GraphicsOutput->Mode->Info->HorizontalResolution;
SizeOfY = GraphicsOutput->Mode->Info->VerticalResolution;
- } else if (UgaDraw != NULL && FeaturePcdGet (PcdUgaConsumeSupport)) {
- Status = 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 != NULL && FeaturePcdGet (PcdUgaConsumeSupport)) {
- Status = UgaDraw->Blt (
- UgaDraw,
- (EFI_UGA_PIXEL *) Blt,
- EfiUgaBltBufferToVideo,
- 0,
- 0,
- (UINTN) DestX,
- (UINTN) DestY,
- Width,
- Height,
- Width * sizeof (EFI_UGA_PIXEL)
- );
} else {
Status = EFI_UNSUPPORTED;
}
@@ -620,19 +590,6 @@ EnableBootLogo (
LogoHeight,
LogoWidth * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)
);
- } else if (UgaDraw != NULL && FeaturePcdGet (PcdUgaConsumeSupport)) {
- Status = UgaDraw->Blt (
- UgaDraw,
- (EFI_UGA_PIXEL *) LogoBlt,
- EfiUgaVideoToBltBuffer,
- LogoDestX,
- LogoDestY,
- 0,
- 0,
- LogoWidth,
- LogoHeight,
- LogoWidth * sizeof (EFI_UGA_PIXEL)
- );
} else {
Status = EFI_UNSUPPORTED;
}
--
2.30.0.windows.2
^ permalink raw reply related [flat|nested] 6+ messages in thread