]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
video: Fix video on coreboot with the copy buffer
authorSimon Glass <sjg@chromium.org>
Mon, 15 Mar 2021 05:00:26 +0000 (18:00 +1300)
committerSimon Glass <sjg@chromium.org>
Sat, 27 Mar 2021 02:04:30 +0000 (15:04 +1300)
The copy buffer, if enabled, prevents booting from coreboot correctly,
since no memory is allocated for it. Allow it to fall back to disabled
in this situation. This ensures that a console is displayed, even if
it is slow.

Signed-off-by: Simon Glass <sjg@chromium.org>
drivers/pci/pci_rom.c

index a14a4db3c2f17448fc82935fa7b5b9213bafbf88..7bad4c82c0cab35f3280b8742cdc9833201ea7bd 100644 (file)
@@ -349,13 +349,10 @@ int vbe_setup_video_priv(struct vesa_mode_info *vesa,
        }
 
        /* Use double buffering if enabled */
-       if (IS_ENABLED(CONFIG_VIDEO_COPY)) {
-               if (!plat->base)
-                       return log_msg_ret("copy", -ENFILE);
+       if (IS_ENABLED(CONFIG_VIDEO_COPY) && plat->base)
                plat->copy_base = vesa->phys_base_ptr;
-       } else {
+       else
                plat->base = vesa->phys_base_ptr;
-       }
        log_debug("base = %lx, copy_base = %lx\n", plat->base, plat->copy_base);
        plat->size = vesa->bytes_per_scanline * vesa->y_resolution;