From b8f90f25b92fc9ac25542c21076fda8ff8c6fa59 Mon Sep 17 00:00:00 2001
From: Toomas Soome <tsoome@me.com>
Date: Thu, 21 Dec 2017 18:30:21 +0200
Subject: [PATCH] 8931 boot1.efi: scan all display modes rather than sequential
 try-fail way Reviewed by: Yuri Pankov <yuripv@yuripv.net> Reviewed by: C
 Fraire <cfraire@me.com> Approved by: Dan McDonald <danmcd@joyent.com>

---
 usr/src/boot/sys/boot/efi/boot1/boot1.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/src/boot/sys/boot/efi/boot1/boot1.c b/usr/src/boot/sys/boot/efi/boot1/boot1.c
index 9c3e11263f..f2159d95ab 100644
--- a/usr/src/boot/sys/boot/efi/boot1/boot1.c
+++ b/usr/src/boot/sys/boot/efi/boot1/boot1.c
@@ -597,10 +597,10 @@ efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABLE *Xsystab)
 	conout = ST->ConOut;
 	conout->Reset(conout, TRUE);
 	max_dim = best_mode = 0;
-	for (i = 0; ; i++) {
+	for (i = 0; i < conout->Mode->MaxMode; i++) {
 		status = conout->QueryMode(conout, i, &cols, &rows);
 		if (EFI_ERROR(status))
-			break;
+			continue;
 		if (cols * rows > max_dim) {
 			max_dim = cols * rows;
 			best_mode = i;
-- 
2.11.4.GIT