Module Name: src
Committed By: nonaka
Date: Fri Mar 24 01:00:47 UTC 2017
Modified Files:
src/sys/arch/i386/stand/efiboot: eficons.c
Log Message:
Don't maximize the screen size when gop is not specified.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/i386/stand/efiboot/eficons.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/efiboot/eficons.c
diff -u src/sys/arch/i386/stand/efiboot/eficons.c:1.1 src/sys/arch/i386/stand/efiboot/eficons.c:1.2
--- src/sys/arch/i386/stand/efiboot/eficons.c:1.1 Tue Jan 24 11:09:14 2017
+++ src/sys/arch/i386/stand/efiboot/eficons.c Fri Mar 24 01:00:47 2017
@@ -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 <non...@netbsd.org>
@@ -209,9 +209,6 @@ bi_framebuffer(void)
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 @@ bi_framebuffer(void)
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 @@ bi_framebuffer(void)
bestres = res;
}
}
+#endif
}
if (bestmode >= 0) {
status = uefi_call_wrapper(efi_gop->SetMode, 2, efi_gop,
