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>

diff --git a/drivers/firmware/efi/libstub/gop.c b/drivers/firmware/efi/libstub/gop.c
index f40d535dccb8ec80f2e9aef9aef8efe11224935a..201b66970b2bb382db1d1e3bfca0eef17321c24f 100644 (file)
--- a/drivers/firmware/efi/libstub/gop.c
+++ b/drivers/firmware/efi/libstub/gop.c
@@ -113,15 +113,16 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto,
                if (status != EFI_SUCCESS)
                        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);
                if (status == EFI_SUCCESS)
                        conout_found = true;
 
-               mode = efi_table_attr(gop, mode);
-               info = efi_table_attr(mode, info);
-
-               if ((!first_gop || conout_found) &&
-                   info->pixel_format != PIXEL_BLT_ONLY) {
+               if (!first_gop || conout_found) {
                        /*
                         * Systems that use the UEFI Console Splitter may
                         * provide multiple GOP devices, not all of which are