openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

efi/gop: Move check for framebuffer before con_out 

If the gop doesn't have a framebuffer, there's no point in checking for
con_out support.

Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Link: https://lore.kernel.org/r/20200320020028.1936003-3-nivedita@alum.mit.edu
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Arvind Sankar 2020-03-19 22:00:16 -04:00 committed by Ard Biesheuvel
parent bd45870409
commit 8cd207973c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/firmware/efi/libstub/gop.c
View File

@ -113,15 +113,16 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto,
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
continue; continue;
mode = efi_table_attr(gop, mode);
info = efi_table_attr(mode, info);
if (info->pixel_format == PIXEL_BLT_ONLY)
continue;
status = efi_bs_call(handle_protocol, h, &conout_proto, &dummy); status = efi_bs_call(handle_protocol, h, &conout_proto, &dummy);
if (status == EFI_SUCCESS) if (status == EFI_SUCCESS)
conout_found = true; conout_found = true;
mode = efi_table_attr(gop, mode); if (!first_gop || conout_found) {
info = efi_table_attr(mode, info);
if ((!first_gop || conout_found) &&
info->pixel_format != PIXEL_BLT_ONLY) {
/* /*
* Systems that use the UEFI Console Splitter may * Systems that use the UEFI Console Splitter may
* provide multiple GOP devices, not all of which are * provide multiple GOP devices, not all of which are