X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=IntelFrameworkModulePkg%2FUniversal%2FBdsDxe%2FBootMaint%2FConsoleOption.c;h=5ab898959e96c7bb067fcc0d2513a93c34188c13;hb=6aa22a177c32344ff1d5f765183d0da416fcc252;hp=da0a8389fa43ebbd9596d5d819fc738272f33d70;hpb=589f16d2bf12d0ec08ab877361f624838edf0ebf;p=mirror_edk2.git diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c index da0a8389fa..5ab898959e 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c @@ -918,25 +918,20 @@ GetConsoleOutMode ( UINTN Mode; UINTN MaxMode; EFI_STATUS Status; - CONSOLE_OUT_MODE *ModeInfo; EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *ConOut; ConOut = gST->ConOut; MaxMode = (UINTN) (ConOut->Mode->MaxMode); - ModeInfo = EfiLibGetVariable (VAR_CON_OUT_MODE, &gEfiGenericPlatformVariableGuid); - - if (ModeInfo != NULL) { - CurrentCol = ModeInfo->Column; - CurrentRow = ModeInfo->Row; - for (Mode = 0; Mode < MaxMode; Mode++) { - Status = ConOut->QueryMode (ConOut, Mode, &Col, &Row); - if (!EFI_ERROR(Status)) { - if (CurrentCol == Col && CurrentRow == Row) { - CallbackData->BmmFakeNvData.ConsoleOutMode = (UINT16) Mode; - break; - } + + CurrentCol = PcdGet32 (PcdConOutColumn); + CurrentRow = PcdGet32 (PcdConOutRow); + for (Mode = 0; Mode < MaxMode; Mode++) { + Status = ConOut->QueryMode (ConOut, Mode, &Col, &Row); + if (!EFI_ERROR(Status)) { + if (CurrentCol == Col && CurrentRow == Row) { + CallbackData->BmmFakeNvData.ConsoleOutMode = (UINT16) Mode; + break; } } - FreePool (ModeInfo); } }