[src/netbsd-9]: src/sys/arch/i386/stand/efiboot Pull up following revision(s)...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/259cad249918
branches:  netbsd-9
changeset: 745226:259cad249918
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Feb 25 19:25:19 2020 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #723):

        sys/arch/i386/stand/efiboot/eficons.c: revision 1.10
        sys/arch/i386/stand/efiboot/eficons.c: revision 1.11

If the default GOP mode is unavailable, fallback to the first mode defined.
PR# port-amd64/55000

Remove check for bestmode==-1 (shouldn't happen)

diffstat:

 sys/arch/i386/stand/efiboot/eficons.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 7a11a354bcf6 -r 259cad249918 sys/arch/i386/stand/efiboot/eficons.c
--- a/sys/arch/i386/stand/efiboot/eficons.c     Tue Feb 25 19:16:23 2020 +0000
+++ b/sys/arch/i386/stand/efiboot/eficons.c     Tue Feb 25 19:25:19 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eficons.c,v 1.6.6.3 2020/02/11 11:36:34 martin Exp $   */
+/*     $NetBSD: eficons.c,v 1.6.6.4 2020/02/25 19:25:19 martin Exp $   */
 
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka%netbsd.org@localhost>
@@ -37,6 +37,7 @@
 #ifndef DEFAULT_GOP_MODE
 #define DEFAULT_GOP_MODE       "1024x768"
 #endif
+#define FALLBACK_GOP_MODE      0
 
 extern struct x86_boot_params boot_params;
 
@@ -420,7 +421,7 @@
        EFI_STATUS status;
        EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *info;
        struct btinfo_framebuffer fb;
-       INT32 bestmode = -1;
+       INT32 bestmode;
        UINTN sz;
 
        if (efi_gop == NULL)
@@ -431,9 +432,9 @@
        } else {
                /* If a mode has not been selected, choose a default */
                bestmode = efi_find_gop_mode(DEFAULT_GOP_MODE);
+               if (bestmode == -1)
+                       bestmode = FALLBACK_GOP_MODE;
        }
-       if (bestmode == -1)
-               goto nofb;
 
        status = uefi_call_wrapper(efi_gop->SetMode, 2, efi_gop,
            bestmode);