:: commit c9baa5f0499a48129ae6b651bd1135632f885188

diff --git a/common/drivers/gop.c b/common/drivers/gop.c
index 3d2ae48b..9b4ba140 100644
--- a/common/drivers/gop.c
+++ b/common/drivers/gop.c
@@ -286,6 +286,9 @@ void init_gop(struct fb_info **ret, size_t *_fbs_count,
                                 &mode_info_size, &mode_info);
 
         if (status == EFI_NOT_STARTED) {
+            if (fbs_count > 0) {
+                continue;
+            }
             status = gop->SetMode(gop, 0);
             if (status) {
                 continue;