From nobody Mon Feb 9 19:52:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+58852+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+58852+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588927131; cv=none; d=zohomail.com; s=zohoarc; b=D3v+MywFqK6yfXOWqhvc1YLG2j62odgWBpP8t/xgVFXFarFM7fO4IMTu5+XD+IQx5OpxPwb7N6i5u7TEhTHqAes+qGngtWr41TydCXtzDEVNLUmypXd3n13ArHNHD8SiucXL78Y4n7/53suw479ttn9fx6g5zS+5k+Di/PGXHMg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588927131; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=D/JpOE+Bzd5msyoFx7Y166jzBJafmn/UhjdLsMJKMbg=; b=UXssyGGiT46TqbZoLVEWOPUKHOrxl9MhPGA0zEGSKrxjqMCz++u855eerkNYaly3txJdAapUzNft5/teoGeR1O0FgJqP83u2nSkWtvPW29OZTRjwFqM4WsUbyqjFqhrIp0h9XHj7IAF/OBV/aS7V00YGVPnC277KFR/qkrG45s8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+58852+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1588927131688533.9555615283324; Fri, 8 May 2020 01:38:51 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id wcMBYY1788612xOTN6HAbNWg; Fri, 08 May 2020 01:38:51 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web12.6879.1588927128006250571 for ; Fri, 08 May 2020 01:38:48 -0700 IronPort-SDR: B4aaWioXbhv61f15EQ1t4d+w+TrD1OFngxvo6GyEhkV1V4OY3Pl9SRGOnZCKGfQMO5F12X71Fr 2fbUZn26Fagw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2020 01:38:36 -0700 IronPort-SDR: KP6XL+y4/VcCrranPnUOZlzmH4TQLybYGRSBGV1FzZIppb1DnqVlKTtrOko4vRNR76JK92uCNE Ez8mBB7YmM7w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="305366591" X-Received: from guominji-mobl.ccr.corp.intel.com ([10.238.4.95]) by FMSMGA003.fm.intel.com with ESMTP; 08 May 2020 01:38:34 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Dandan Bi , Eric Dong , Zhichao Gao , Ray Ni Subject: [edk2-devel] [PATCH 06/18] MdeModulePkg/GraphicsConsoleDxe: Remove All UGA Support Date: Fri, 8 May 2020 16:38:12 +0800 Message-Id: <20200508083824.1785-7-guomin.jiang@intel.com> In-Reply-To: <20200508083824.1785-1-guomin.jiang@intel.com> References: <20200508083824.1785-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,guomin.jiang@intel.com X-Gm-Message-State: PHtp3deaQVt3ASHhsp2jbkK2x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588927131; bh=DlAF9ILwj0558cCEmbZyne0oBaRCpIAvi5vXmUlbHlw=; h=Cc:Date:From:Reply-To:Subject:To; b=E2Rzw4BWMRK/zBwFMS4IsNAHSfozfYCwYwJoj536aRWGlo05rY1UbNvqov2XZsDt00B f7PXFAOQc7t4ZdSxN+VNmT6qdeF3dBhc9C76SpCnHnxYlzRBnH3J9KnEqxXZwMs5xe4CT rHC2hkzaNalFFnLB2dQgzhnd1FufbrORQlI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: GuoMinJ REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2368 Remove All UGA Support in GraphicsConsoleDxe, remove comment about UGA in HiiDatabaseDxe. Cc: Dandan Bi Cc: Eric Dong Cc: Zhichao Gao Cc: Ray Ni Signed-off-by: Guomin Jiang --- .../GraphicsConsoleDxe/GraphicsConsole.c | 299 +----------------- .../GraphicsConsoleDxe/GraphicsConsole.h | 19 +- .../GraphicsConsoleDxe/GraphicsConsoleDxe.inf | 6 +- .../GraphicsConsoleDxe/GraphicsConsoleDxe.uni | 4 +- MdeModulePkg/Universal/HiiDatabaseDxe/Image.c | 2 +- 5 files changed, 19 insertions(+), 311 deletions(-) diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsCons= ole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c index c042451a9b52..55c9e8f5ebf4 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c @@ -14,7 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent GRAPHICS_CONSOLE_DEV mGraphicsConsoleDevTemplate =3D { GRAPHICS_CONSOLE_DEV_SIGNATURE, (EFI_GRAPHICS_OUTPUT_PROTOCOL *) NULL, - (EFI_UGA_DRAW_PROTOCOL *) NULL, { GraphicsConsoleConOutReset, GraphicsConsoleConOutOutputString, @@ -99,9 +98,8 @@ EFI_DRIVER_BINDING_PROTOCOL gGraphicsConsoleDriverBinding= =3D { /** Test to see if Graphics Console could be supported on the Controller. =20 - Graphics Console could be supported if Graphics Output Protocol or UGA D= raw - Protocol exists on the Controller. (UGA Draw Protocol could be skipped - if PcdUgaConsumeSupport is set to FALSE.) + Graphics Console could be supported if Graphics Output Protocol + exists on the Controller. =20 @param This Protocol instance pointer. @param Controller Handle of device to test. @@ -122,11 +120,9 @@ GraphicsConsoleControllerDriverSupported ( { EFI_STATUS Status; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; EFI_DEVICE_PATH_PROTOCOL *DevicePath; =20 GraphicsOutput =3D NULL; - UgaDraw =3D NULL; // // Open the IO Abstraction(s) needed to perform the supported test // @@ -138,20 +134,6 @@ GraphicsConsoleControllerDriverSupported ( Controller, EFI_OPEN_PROTOCOL_BY_DRIVER ); - - if (EFI_ERROR (Status) && FeaturePcdGet (PcdUgaConsumeSupport)) { - // - // Open Graphics Output Protocol failed, try to open UGA Draw Protocol - // - Status =3D gBS->OpenProtocol ( - Controller, - &gEfiUgaDrawProtocolGuid, - (VOID **) &UgaDraw, - This->DriverBindingHandle, - Controller, - EFI_OPEN_PROTOCOL_BY_DRIVER - ); - } if (EFI_ERROR (Status)) { return Status; } @@ -196,13 +178,6 @@ GraphicsConsoleControllerDriverSupported ( This->DriverBindingHandle, Controller ); - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - gBS->CloseProtocol ( - Controller, - &gEfiUgaDrawProtocolGuid, - This->DriverBindingHandle, - Controller - ); } return Status; } @@ -351,9 +326,8 @@ InitializeGraphicsConsoleTextMode ( } =20 /** - Start this driver on Controller by opening Graphics Output protocol or - UGA Draw protocol, and installing Simple Text Out protocol on Controller. - (UGA Draw protocol could be skipped if PcdUgaConsumeSupport is set to FA= LSE.) + Start this driver on Controller by opening Graphics Output protocol + and installing Simple Text Out protocol on Controller. =20 @param This Protocol instance pointer. @param Controller Handle of device to bind driver to @@ -376,8 +350,6 @@ GraphicsConsoleControllerDriverStart ( GRAPHICS_CONSOLE_DEV *Private; UINT32 HorizontalResolution; UINT32 VerticalResolution; - UINT32 ColorDepth; - UINT32 RefreshRate; UINT32 ModeIndex; UINTN MaxMode; UINT32 ModeNumber; @@ -414,18 +386,6 @@ GraphicsConsoleControllerDriverStart ( Controller, EFI_OPEN_PROTOCOL_BY_DRIVER ); - - if (EFI_ERROR(Status) && FeaturePcdGet (PcdUgaConsumeSupport)) { - Status =3D gBS->OpenProtocol ( - Controller, - &gEfiUgaDrawProtocolGuid, - (VOID **) &Private->UgaDraw, - This->DriverBindingHandle, - Controller, - EFI_OPEN_PROTOCOL_BY_DRIVER - ); - } - if (EFI_ERROR (Status)) { goto Error; } @@ -512,43 +472,6 @@ GraphicsConsoleControllerDriverStart ( goto Error; } } - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - // - // At first try to set user-defined resolution - // - ColorDepth =3D 32; - RefreshRate =3D 60; - Status =3D Private->UgaDraw->SetMode ( - Private->UgaDraw, - HorizontalResolution, - VerticalResolution, - ColorDepth, - RefreshRate - ); - if (EFI_ERROR (Status)) { - // - // Try to set 800*600 which is required by UEFI/EFI spec - // - Status =3D Private->UgaDraw->SetMode ( - Private->UgaDraw, - 800, - 600, - ColorDepth, - RefreshRate - ); - if (EFI_ERROR (Status)) { - Status =3D Private->UgaDraw->GetMode ( - Private->UgaDraw, - &HorizontalResolution, - &VerticalResolution, - &ColorDepth, - &RefreshRate - ); - if (EFI_ERROR (Status)) { - goto Error; - } - } - } } =20 DEBUG ((EFI_D_INFO, "GraphicsConsole video resolution %d x %d\n", Horizo= ntalResolution, VerticalResolution)); @@ -613,7 +536,7 @@ GraphicsConsoleControllerDriverStart ( Error: if (EFI_ERROR (Status)) { // - // Close the GOP and UGA Draw Protocol + // Close the GOP // if (Private->GraphicsOutput !=3D NULL) { gBS->CloseProtocol ( @@ -622,13 +545,6 @@ GraphicsConsoleControllerDriverStart ( This->DriverBindingHandle, Controller ); - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - gBS->CloseProtocol ( - Controller, - &gEfiUgaDrawProtocolGuid, - This->DriverBindingHandle, - Controller - ); } =20 if (Private->LineBuffer !=3D NULL) { @@ -650,9 +566,7 @@ GraphicsConsoleControllerDriverStart ( =20 /** Stop this driver on Controller by removing Simple Text Out protocol - and closing the Graphics Output Protocol or UGA Draw protocol on Control= ler. - (UGA Draw protocol could be skipped if PcdUgaConsumeSupport is set to FA= LSE.) - + and closing the Graphics Output Protocol on Controller. =20 @param This Protocol instance pointer. @param Controller Handle of device to stop driver on @@ -701,7 +615,7 @@ GraphicsConsoleControllerDriverStop ( =20 if (!EFI_ERROR (Status)) { // - // Close the GOP or UGA IO Protocol + // Close the GOP Protocol // if (Private->GraphicsOutput !=3D NULL) { gBS->CloseProtocol ( @@ -710,13 +624,6 @@ GraphicsConsoleControllerDriverStop ( This->DriverBindingHandle, Controller ); - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - gBS->CloseProtocol ( - Controller, - &gEfiUgaDrawProtocolGuid, - This->DriverBindingHandle, - Controller - ); } =20 if (Private->LineBuffer !=3D NULL) { @@ -905,7 +812,6 @@ GraphicsConsoleConOutOutputString ( { GRAPHICS_CONSOLE_DEV *Private; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; INTN Mode; UINTN MaxColumn; UINTN MaxRow; @@ -939,7 +845,6 @@ GraphicsConsoleConOutOutputString ( Mode =3D This->Mode->Mode; Private =3D GRAPHICS_CONSOLE_CON_OUT_DEV_FROM_THIS (This); GraphicsOutput =3D Private->GraphicsOutput; - UgaDraw =3D Private->UgaDraw; =20 MaxColumn =3D Private->ModeData[Mode].Columns; MaxRow =3D Private->ModeData[Mode].Rows; @@ -1029,38 +934,6 @@ GraphicsConsoleConOutOutputString ( EFI_GLYPH_HEIGHT, Delta ); - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - // - // Scroll Screen Up One Row - // - UgaDraw->Blt ( - UgaDraw, - NULL, - EfiUgaVideoToVideo, - DeltaX, - DeltaY + EFI_GLYPH_HEIGHT, - DeltaX, - DeltaY, - Width, - Height, - Delta - ); - - // - // Print Blank Line at last line - // - UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) (UINTN) &Background, - EfiUgaVideoFill, - 0, - 0, - DeltaX, - DeltaY + Height, - Width, - EFI_GLYPH_HEIGHT, - Delta - ); } } else { This->Mode->CursorRow++; @@ -1300,19 +1173,13 @@ GraphicsConsoleConOutSetMode ( GRAPHICS_CONSOLE_DEV *Private; GRAPHICS_CONSOLE_MODE_DATA *ModeData; EFI_GRAPHICS_OUTPUT_BLT_PIXEL *NewLineBuffer; - UINT32 HorizontalResolution; - UINT32 VerticalResolution; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; - UINT32 ColorDepth; - UINT32 RefreshRate; EFI_TPL OldTpl; =20 OldTpl =3D gBS->RaiseTPL (TPL_NOTIFY); =20 Private =3D GRAPHICS_CONSOLE_CON_OUT_DEV_FROM_THIS (This); GraphicsOutput =3D Private->GraphicsOutput; - UgaDraw =3D Private->UgaDraw; =20 // // Make sure the requested mode number is supported @@ -1345,7 +1212,7 @@ GraphicsConsoleConOutSetMode ( goto Done; } // - // Otherwise, the size of the text console and/or the GOP/UGA mode wil= l be changed, + // Otherwise, the size of the text console and/or the GOP mode will be= changed, // so erase the cursor, and free the LineBuffer for the current mode // FlushCursor (This); @@ -1401,51 +1268,6 @@ GraphicsConsoleConOutSetMode ( 0 ); } - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - // - // Get the current UGA Draw mode information - // - Status =3D UgaDraw->GetMode ( - UgaDraw, - &HorizontalResolution, - &VerticalResolution, - &ColorDepth, - &RefreshRate - ); - if (EFI_ERROR (Status) || HorizontalResolution !=3D ModeData->GopWidth= || VerticalResolution !=3D ModeData->GopHeight) { - // - // Either no graphics mode is currently set, or it is set to the wro= ng resolution, so set the new graphics mode - // - Status =3D UgaDraw->SetMode ( - UgaDraw, - ModeData->GopWidth, - ModeData->GopHeight, - 32, - 60 - ); - if (EFI_ERROR (Status)) { - // - // The mode set operation failed - // - goto Done; - } - } else { - // - // The current graphics mode is correct, so simply clear the entire = display - // - Status =3D UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) (UINTN) &mGraphicsEfiColors[0], - EfiUgaVideoFill, - 0, - 0, - 0, - 0, - ModeData->GopWidth, - ModeData->GopHeight, - 0 - ); - } } =20 // @@ -1539,7 +1361,6 @@ GraphicsConsoleConOutClearScreen ( GRAPHICS_CONSOLE_DEV *Private; GRAPHICS_CONSOLE_MODE_DATA *ModeData; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; EFI_GRAPHICS_OUTPUT_BLT_PIXEL Foreground; EFI_GRAPHICS_OUTPUT_BLT_PIXEL Background; EFI_TPL OldTpl; @@ -1555,7 +1376,6 @@ GraphicsConsoleConOutClearScreen ( =20 Private =3D GRAPHICS_CONSOLE_CON_OUT_DEV_FROM_THIS (This); GraphicsOutput =3D Private->GraphicsOutput; - UgaDraw =3D Private->UgaDraw; ModeData =3D &(Private->ModeData[This->Mode->Mode]); =20 GetTextColors (This, &Foreground, &Background); @@ -1572,19 +1392,6 @@ GraphicsConsoleConOutClearScreen ( ModeData->GopHeight, 0 ); - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - Status =3D UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) (UINTN) &Background, - EfiUgaVideoFill, - 0, - 0, - 0, - 0, - ModeData->GopWidth, - ModeData->GopHeight, - 0 - ); } else { Status =3D EFI_UNSUPPORTED; } @@ -1747,7 +1554,7 @@ GetTextColors ( @param Count The count of Unicode string. =20 @retval EFI_OUT_OF_RESOURCES If no memory resource to use. - @retval EFI_UNSUPPORTED If no Graphics Output protocol and UGA Draw + @retval EFI_UNSUPPORTED If no Graphics Output protocol protocol exist. @retval EFI_SUCCESS Drawing Unicode string implemented success= fully. =20 @@ -1764,9 +1571,6 @@ DrawUnicodeWeightAtCursorN ( EFI_IMAGE_OUTPUT *Blt; EFI_STRING String; EFI_FONT_DISPLAY_INFO *FontInfo; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; - EFI_HII_ROW_INFO *RowInfoArray; - UINTN RowInfoArraySize; =20 Private =3D GRAPHICS_CONSOLE_CON_OUT_DEV_FROM_THIS (This); Blt =3D (EFI_IMAGE_OUTPUT *) AllocateZeroPool (sizeof (EFI_IMAGE_OUTPUT)= ); @@ -1817,63 +1621,6 @@ DrawUnicodeWeightAtCursorN ( NULL ); =20 - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - // - // If Graphics Output protocol cannot be found and PcdUgaConsumeSuppor= t enabled, - // using UGA Draw protocol to draw. - // - ASSERT (Private->UgaDraw!=3D NULL); - - UgaDraw =3D Private->UgaDraw; - - Blt->Image.Bitmap =3D AllocateZeroPool (Blt->Width * Blt->Height * siz= eof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); - if (Blt->Image.Bitmap =3D=3D NULL) { - FreePool (Blt); - FreePool (String); - return EFI_OUT_OF_RESOURCES; - } - - RowInfoArray =3D NULL; - // - // StringToImage only support blt'ing image to device using GOP proto= col. If GOP is not supported in this platform, - // we ask StringToImage to print the string to blt buffer, then blt t= o device using UgaDraw. - // - Status =3D mHiiFont->StringToImage ( - mHiiFont, - EFI_HII_IGNORE_IF_NO_GLYPH | EFI_HII_IGNORE_LINE= _BREAK, - String, - FontInfo, - &Blt, - This->Mode->CursorColumn * EFI_GLYPH_WIDTH + Pri= vate->ModeData[This->Mode->Mode].DeltaX, - This->Mode->CursorRow * EFI_GLYPH_HEIGHT + Priva= te->ModeData[This->Mode->Mode].DeltaY, - &RowInfoArray, - &RowInfoArraySize, - NULL - ); - - if (!EFI_ERROR (Status)) { - // - // Line breaks are handled by caller of DrawUnicodeWeightAtCursorN, = so the updated parameter RowInfoArraySize by StringToImage will - // always be 1 or 0 (if there is no valid Unicode Char can be printe= d). ASSERT here to make sure. - // - ASSERT (RowInfoArraySize <=3D 1); - - Status =3D UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) Blt->Image.Bitmap, - EfiUgaBltBufferToVideo, - This->Mode->CursorColumn * EFI_GLYPH_WIDTH + Pr= ivate->ModeData[This->Mode->Mode].DeltaX, - (This->Mode->CursorRow) * EFI_GLYPH_HEIGHT + Pri= vate->ModeData[This->Mode->Mode].DeltaY, - This->Mode->CursorColumn * EFI_GLYPH_WIDTH + Pr= ivate->ModeData[This->Mode->Mode].DeltaX, - (This->Mode->CursorRow) * EFI_GLYPH_HEIGHT + Pri= vate->ModeData[This->Mode->Mode].DeltaY, - RowInfoArray[0].LineWidth, - RowInfoArray[0].LineHeight, - Blt->Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIX= EL) - ); - } - - FreePool (RowInfoArray); - FreePool (Blt->Image.Bitmap); } else { Status =3D EFI_UNSUPPORTED; } @@ -1913,7 +1660,6 @@ FlushCursor ( INTN GlyphX; INTN GlyphY; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION Foreground; EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION Background; EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION BltChar[EFI_GLYPH_HEIGHT][EFI_GLYPH_= WIDTH]; @@ -1928,7 +1674,6 @@ FlushCursor ( =20 Private =3D GRAPHICS_CONSOLE_CON_OUT_DEV_FROM_THIS (This); GraphicsOutput =3D Private->GraphicsOutput; - UgaDraw =3D Private->UgaDraw; =20 // // In this driver, only narrow character was supported. @@ -1951,19 +1696,6 @@ FlushCursor ( EFI_GLYPH_HEIGHT, EFI_GLYPH_WIDTH * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) ); - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) (UINTN) BltChar, - EfiUgaVideoToBltBuffer, - GlyphX, - GlyphY, - 0, - 0, - EFI_GLYPH_WIDTH, - EFI_GLYPH_HEIGHT, - EFI_GLYPH_WIDTH * sizeof (EFI_UGA_PIXEL) - ); } =20 GetTextColors (This, &Foreground.Pixel, &Background.Pixel); @@ -1992,19 +1724,6 @@ FlushCursor ( EFI_GLYPH_HEIGHT, EFI_GLYPH_WIDTH * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) ); - } else if (FeaturePcdGet (PcdUgaConsumeSupport)) { - UgaDraw->Blt ( - UgaDraw, - (EFI_UGA_PIXEL *) (UINTN) BltChar, - EfiUgaBltBufferToVideo, - 0, - 0, - GlyphX, - GlyphY, - EFI_GLYPH_WIDTH, - EFI_GLYPH_HEIGHT, - EFI_GLYPH_WIDTH * sizeof (EFI_UGA_PIXEL) - ); } =20 return EFI_SUCCESS; diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsCons= ole.h b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h index 28d47ac7cb1e..de10e133809a 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h @@ -12,7 +12,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include #include -#include #include #include #include @@ -60,7 +59,6 @@ typedef struct { typedef struct { UINTN Signature; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; - EFI_UGA_DRAW_PROTOCOL *UgaDraw; EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL SimpleTextOutput; EFI_SIMPLE_TEXT_OUTPUT_MODE SimpleTextOutputMode; GRAPHICS_CONSOLE_MODE_DATA *ModeData; @@ -422,9 +420,8 @@ GraphicsConsoleConOutEnableCursor ( /** Test to see if Graphics Console could be supported on the Controller. =20 - Graphics Console could be supported if Graphics Output Protocol or UGA D= raw - Protocol exists on the Controller. (UGA Draw Protocol could be skipped - if PcdUgaConsumeSupport is set to FALSE.) + Graphics Console could be supported if Graphics Output Protocol + exists on the Controller. =20 @param This Protocol instance pointer. @param Controller Handle of device to test. @@ -445,9 +442,8 @@ GraphicsConsoleControllerDriverSupported ( =20 =20 /** - Start this driver on Controller by opening Graphics Output protocol or - UGA Draw protocol, and installing Simple Text Out protocol on Controller. - (UGA Draw protocol could be skipped if PcdUgaConsumeSupport is set to FA= LSE.) + Start this driver on Controller by opening Graphics Output protocol + and installing Simple Text Out protocol on Controller. =20 @param This Protocol instance pointer. @param Controller Handle of device to bind driver to @@ -468,9 +464,7 @@ GraphicsConsoleControllerDriverStart ( =20 /** Stop this driver on Controller by removing Simple Text Out protocol - and closing the Graphics Output Protocol or UGA Draw protocol on Control= ler. - (UGA Draw protocol could be skipped if PcdUgaConsumeSupport is set to FA= LSE.) - + and closing the Graphics Output Protocol on Controller. =20 @param This Protocol instance pointer. @param Controller Handle of device to stop driver on @@ -534,8 +528,7 @@ GetTextColors ( @param Count The count of Unicode string. =20 @retval EFI_OUT_OF_RESOURCES If no memory resource to use. - @retval EFI_UNSUPPORTED If no Graphics Output protocol and UGA Draw - protocol exist. + @retval EFI_UNSUPPORTED If no Graphics Output protocol exist. @retval EFI_SUCCESS Drawing Unicode string implemented success= fully. =20 **/ diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsCons= oleDxe.inf b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsCons= oleDxe.inf index bcfd306eee13..975871b76d05 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.= inf +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.= inf @@ -2,7 +2,7 @@ # Console support on graphic devices. # # This driver will install Simple Text Output protocol by consuming Graph= ices Output -# protocol or UGA Draw protocol on graphic devices. +# protocol on graphic devices. # # Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent @@ -53,15 +53,11 @@ [Protocols] gEfiDevicePathProtocolGuid ## TO_START gEfiSimpleTextOutProtocolGuid ## BY_START gEfiGraphicsOutputProtocolGuid ## TO_START - gEfiUgaDrawProtocolGuid ## TO_START gEfiHiiFontProtocolGuid ## TO_START ## TO_START ## NOTIFY gEfiHiiDatabaseProtocolGuid =20 -[FeaturePcd] - gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport ## CONSUMES - [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution ## SOMETIMES= _CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution ## SOMETIMES= _CONSUMES diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsCons= oleDxe.uni b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsCons= oleDxe.uni index aec5d57f9038..45dbb24c8bca 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.= uni +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.= uni @@ -2,7 +2,7 @@ // Console support on graphic devices. // // This driver will install Simple Text Output protocol by consuming Graph= ices Output -// protocol or UGA Draw protocol on graphic devices. +// protocol on graphic devices. // // Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
// @@ -14,5 +14,5 @@ #string STR_MODULE_ABSTRACT #language en-US "Console support o= n graphic devices" =20 #string STR_MODULE_DESCRIPTION #language en-US "This driver will = install SimpleTextOutputProtocol by consuming GraphicesOutput\n" - "Protocol or UgaDr= awProtocol on graphics devices." + "Protocol on graph= ics devices." =20 diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c b/MdeModulePkg/U= niversal/HiiDatabaseDxe/Image.c index a108fc6157a2..57f6fad15ea3 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c @@ -1381,7 +1381,7 @@ HiiDrawImage ( // if ((Flags & EFI_HII_DIRECT_TO_SCREEN) =3D=3D EFI_HII_DIRECT_TO_SCREEN= ) { // - // Caller should make sure the current UGA console is grarphic mode. + // Caller should make sure the current console is grarphic mode. // =20 // --=20 2.25.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#58852): https://edk2.groups.io/g/devel/message/58852 Mute This Topic: https://groups.io/mt/74068785/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-