[src/trunk]: src/sys/arch/i386/stand/efiboot Don't maximize the screen size w...

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

details:   https://anonhg.NetBSD.org/src/rev/fa4a0d4915a0
branches:  trunk
changeset: 822527:fa4a0d4915a0
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Fri Mar 24 01:00:47 2017 +0000

description:
Don't maximize the screen size when gop is not specified.

diffstat:

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

diffs (41 lines):

diff -r 940f0e310284 -r fa4a0d4915a0 sys/arch/i386/stand/efiboot/eficons.c
--- a/sys/arch/i386/stand/efiboot/eficons.c     Fri Mar 24 00:52:49 2017 +0000
+++ b/sys/arch/i386/stand/efiboot/eficons.c     Fri Mar 24 01:00:47 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eficons.c,v 1.1 2017/01/24 11:09:14 nonaka Exp $       */
+/*     $NetBSD: eficons.c,v 1.2 2017/03/24 01:00:47 nonaka Exp $       */
 
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka%netbsd.org@localhost>
@@ -209,9 +209,6 @@
        EFI_STATUS status;
        EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *info;
        struct btinfo_framebuffer fb;
-       UINT64 res, bestres = 0;
-       UINTN sz;
-       UINT32 i;
        INT32 bestmode = -1;
 
        if (efi_gop == NULL) {
@@ -222,7 +219,12 @@
        if (efi_gop_mode >= 0) {
                bestmode = efi_gop_mode;
        } else {
-               /* XXX EDID? EFI_EDID_DISCOVERD_PROTOCOL */
+#if 0
+               UINT64 res, bestres = 0;
+               UINTN sz;
+               UINT32 i;
+
+               /* XXX EDID? EFI_EDID_DISCOVERED_PROTOCOL */
                for (i = 0; i < efi_gop->Mode->MaxMode; i++) {
                        status = uefi_call_wrapper(efi_gop->QueryMode, 4,
                            efi_gop, i, &sz, &info);
@@ -237,6 +239,7 @@
                                bestres = res;
                        }
                }
+#endif
        }
        if (bestmode >= 0) {
                status = uefi_call_wrapper(efi_gop->SetMode, 2, efi_gop,