Changeset
vgasrc/cbvga.c   | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
vgasrc/stdvga.c  |   5 ++
vgasrc/vbe.c     |   2 +-
vgasrc/vgahw.h   |   6 +++
vgasrc/vgautil.h |   2 +
5 files changed, 144 insertions(+), 7 deletions(-)
Git apply log
Switched to a new branch '20170529172514.8308-1-siro@das-labor.org'
Applying: SeaVGABios/cbvga: Advertise correct pixel format
Applying: SeaVGABios/cbvga: Assume VGA compatible GPU in text-mode
Applying: SeaVGABIOS/vbe: Query driver for scanline pitch v2
Applying: SeaVGABios/cbvga: Use active mode to clear screen
Applying: SeaVGABios/cbvga: Advertise compatible VESA modes
To https://github.com/patchew-project/seabios
 * [new tag]         patchew/20170529172514.8308-1-siro@das-labor.org -> patchew/20170529172514.8308-1-siro@das-labor.org
[SeaBIOS] [PATCH 0/5] SeaVGABIOS improvments for coreboot's framebuffer v3
Posted by Patrick Rudolph, 16 weeks ago
This series add several fixes to coreboot's framebuffer implementation 
and it main purpose is to fix Microsoft's Windows as supported OS.

Tests showed that it also fixes ISOLINUX and gfxboot.

The series fixes the following issues:
* Windows shows no image in text-mode
* Windows NTLDR/bootmgr shows no image in VESA mode
* Windows shows no image in VESA mode
* ISOLINUX requires VESA mode 640x480
* GFXBOOT requires 32bpp VESA modes

I was able to boot Windows with the following configurations:
* using VgaSave driver in text-mode with a
  fixed display resolution of 640x480 at 4Bpp.
* using VgaSave driver in VESA mode and
  set a display resolution up to 1600x1200 at 24Bpp.
* using VgaSave driver in Windows's "Safe Mode" in VESA mode and
  set a display resolution up to 1600x1200 at 24Bpp.

Most likely other VESA compatible bootloaders and operating systems
will be fixed, too.

Changes since v2:
* Disable VESA modes in cbvga_init
* No Intel or Windows specific patches
* Update commit message of "Assume VGA compatible GPU in text-mode"
* Tested and dokumented more bootloaders

Patrick Rudolph (5):
  SeaVGABios/cbvga: Advertise correct pixel format
  SeaVGABios/cbvga: Assume VGA compatible GPU in text-mode
  SeaVGABIOS/vbe: Query driver for scanline pitch v2
  SeaVGABios/cbvga: Use active mode to clear screen
  SeaVGABios/cbvga: Advertise compatible VESA  modes

 vgasrc/cbvga.c   | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 vgasrc/stdvga.c  |   5 ++
 vgasrc/vbe.c     |   2 +-
 vgasrc/vgahw.h   |   6 +++
 vgasrc/vgautil.h |   2 +
 5 files changed, 144 insertions(+), 7 deletions(-)

-- 
2.9.3


_______________________________________________
SeaBIOS mailing list
SeaBIOS@seabios.org
https://mail.coreboot.org/mailman/listinfo/seabios
Re: [SeaBIOS] [PATCH 0/5] SeaVGABIOS improvments for coreboot's framebuffer v3
Posted by Kevin O'Connor, 14 weeks ago
On Mon, May 29, 2017 at 07:25:09PM +0200, Patrick Rudolph wrote:
> This series add several fixes to coreboot's framebuffer implementation 
> and it main purpose is to fix Microsoft's Windows as supported OS.
> 
> Tests showed that it also fixes ISOLINUX and gfxboot.
> 
> The series fixes the following issues:
> * Windows shows no image in text-mode
> * Windows NTLDR/bootmgr shows no image in VESA mode
> * Windows shows no image in VESA mode
> * ISOLINUX requires VESA mode 640x480
> * GFXBOOT requires 32bpp VESA modes
> 
> I was able to boot Windows with the following configurations:
> * using VgaSave driver in text-mode with a
>   fixed display resolution of 640x480 at 4Bpp.
> * using VgaSave driver in VESA mode and
>   set a display resolution up to 1600x1200 at 24Bpp.
> * using VgaSave driver in Windows's "Safe Mode" in VESA mode and
>   set a display resolution up to 1600x1200 at 24Bpp.
> 
> Most likely other VESA compatible bootloaders and operating systems
> will be fixed, too.
> 
> Changes since v2:
> * Disable VESA modes in cbvga_init
> * No Intel or Windows specific patches
> * Update commit message of "Assume VGA compatible GPU in text-mode"
> * Tested and dokumented more bootloaders

Thanks.  I committed patches 1, 3, 4, 5.

I'm not confident on patch 2 - I can't see why cbvga should behave
like stdvga when a user could just compile a stdvga vgabios instead of
cbvga.  I fixed up patch 5 to apply without patch 2.

-Kevin

_______________________________________________
SeaBIOS mailing list
SeaBIOS@seabios.org
https://mail.coreboot.org/mailman/listinfo/seabios
[SeaBIOS] [PATCH 1/5] SeaVGABios/cbvga: Advertise correct pixel format
Posted by Patrick Rudolph, 16 weeks ago
Accumulate the pixel format's bits instead relying on coreboot's
bits_per_pixel, which says nothing about the active pixel format.

Allows VBE to correctly advertise XRGB8 and BGRX8 framebuffer formats,
commonly used by coreboot.

Fixes at least Windows Bootloader and gfxboot.

Signed-off-by: Patrick Rudolph <siro@das-labor.org>
---
 vgasrc/cbvga.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vgasrc/cbvga.c b/vgasrc/cbvga.c
index b8216a9..39ffdbb 100644
--- a/vgasrc/cbvga.c
+++ b/vgasrc/cbvga.c
@@ -1,6 +1,7 @@
 // Simple framebuffer vgabios for use with coreboot native vga init.
 //
 // Copyright (C) 2014  Kevin O'Connor <kevin@koconnor.net>
+// Copyright (C) 2017  Patrick Rudolph <siro@das-labor.org>
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
@@ -164,7 +165,8 @@ cbvga_setup(void)
     }
 
     u64 addr = GET_FARVAR(0, cbfb->physical_address);
-    u8 bpp = GET_FARVAR(0, cbfb->bits_per_pixel);
+    u8 bpp = cbfb->blue_mask_size + cbfb->green_mask_size
+             + cbfb->red_mask_size + cbfb->reserved_mask_size;
     u32 xlines = GET_FARVAR(0, cbfb->x_resolution);
     u32 ylines = GET_FARVAR(0, cbfb->y_resolution);
     u32 linelength = GET_FARVAR(0, cbfb->bytes_per_line);
-- 
2.9.3


_______________________________________________
SeaBIOS mailing list
SeaBIOS@seabios.org
https://mail.coreboot.org/mailman/listinfo/seabios
[SeaBIOS] [PATCH 2/5] SeaVGABios/cbvga: Assume VGA compatible GPU in text-mode
Posted by Patrick Rudolph, 16 weeks ago
Assume the GPU is VGA compatible when running in text-mode.
Advertise VGA modes.
Microsoft Windows relies on graphics mode 12 as last resort when
running in text mode. It is used even when not advertised.

Allows to boot Windows 7 in "Safe Mode" and shows the boot splash.

While the stdvga driver could be used instead, implementing it properly
in the cbvga driver allows to switch between text and gfx mode using
NVRAM option.

Signed-off-by: Patrick Rudolph <siro@das-labor.org>
---
 vgasrc/cbvga.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/vgasrc/cbvga.c b/vgasrc/cbvga.c
index 39ffdbb..49af7f9 100644
--- a/vgasrc/cbvga.c
+++ b/vgasrc/cbvga.c
@@ -21,6 +21,10 @@ static u32 CBlinelength VAR16;
 
 struct vgamode_s *cbvga_find_mode(int mode)
 {
+    /* Assume VGA compatible hardware in text-mode. */
+    if (GET_GLOBAL(CBmode) == 0x3)
+        return stdvga_find_mode(mode);
+
     if (mode == GET_GLOBAL(CBmode))
         return &CBmodeinfo;
     if (mode == 0x03)
@@ -31,11 +35,11 @@ struct vgamode_s *cbvga_find_mode(int mode)
 void
 cbvga_list_modes(u16 seg, u16 *dest, u16 *last)
 {
-    if (dest<last) {
-        SET_FARVAR(seg, *dest, GET_GLOBAL(CBmode));
-        dest++;
+
+    /* Assume VGA compatible hardware in text-mode. */
+    if (GET_GLOBAL(CBmode) == 0x3) {
+        stdvga_list_modes(seg, dest, last);
     }
-    SET_FARVAR(seg, *dest, 0xffff);
 }
 
 int
@@ -98,6 +102,11 @@ int
 cbvga_set_mode(struct vgamode_s *vmode_g, int flags)
 {
     u8 emul = vmode_g == &CBemulinfo || GET_GLOBAL(CBmode) == 0x03;
+
+    /* Assume VGA compatible hardware in text-mode. */
+    if (GET_GLOBAL(CBmode) == 0x03)
+        return stdvga_set_mode(vmode_g, flags);
+
     MASK_BDA_EXT(flags, BF_EMULATE_TEXT, emul ? BF_EMULATE_TEXT : 0);
     if (!(flags & MF_NOCLEARMEM)) {
         if (GET_GLOBAL(CBmodeinfo.memmodel) == MM_TEXT) {
-- 
2.9.3


_______________________________________________
SeaBIOS mailing list
SeaBIOS@seabios.org
https://mail.coreboot.org/mailman/listinfo/seabios
[SeaBIOS] [PATCH 3/5] SeaVGABIOS/vbe: Query driver for scanline pitch v2
Posted by Patrick Rudolph, 16 weeks ago
Query the driver for the real scanline pitch in bytes.

As cbvga doesn't change the pitch on mode change, always
return the same pitch, that might exceed width times Bytes-per-pixel.

Report the default stdvga pitch for all other drivers.

Signed-off-by: Patrick Rudolph <siro@das-labor.org>
---
 vgasrc/cbvga.c   | 7 +++++++
 vgasrc/stdvga.c  | 5 +++++
 vgasrc/vbe.c     | 2 +-
 vgasrc/vgahw.h   | 6 ++++++
 vgasrc/vgautil.h | 2 ++
 5 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/vgasrc/cbvga.c b/vgasrc/cbvga.c
index 49af7f9..6b3233e 100644
--- a/vgasrc/cbvga.c
+++ b/vgasrc/cbvga.c
@@ -124,6 +124,13 @@ cbvga_set_mode(struct vgamode_s *vmode_g, int flags)
     return 0;
 }
 
+int
+cbvga_get_linesize(struct vgamode_s *vmode_g)
+{
+    /* Can't change mode, always report active pitch. */
+    return GET_GLOBAL(CBlinelength);
+}
+
 #define CB_TAG_FRAMEBUFFER      0x0012
 struct cb_framebuffer {
     u32 tag;
diff --git a/vgasrc/stdvga.c b/vgasrc/stdvga.c
index 886deca..0e24297 100644
--- a/vgasrc/stdvga.c
+++ b/vgasrc/stdvga.c
@@ -321,6 +321,11 @@ stdvga_set_dacformat(struct vgamode_s *vmode_g, int val)
     return -1;
 }
 
+int
+stdvga_get_linesize(struct vgamode_s *vmode_g)
+{
+    return DIV_ROUND_UP(vmode_g->width * vga_bpp(vmode_g), 8);
+}
 
 /****************************************************************
  * Save/Restore state
diff --git a/vgasrc/vbe.c b/vgasrc/vbe.c
index facad19..724c1ba 100644
--- a/vgasrc/vbe.c
+++ b/vgasrc/vbe.c
@@ -107,7 +107,7 @@ vbe_104f01(struct bregs *regs)
     // Basic information about mode.
     int width = GET_GLOBAL(vmode_g->width);
     int height = GET_GLOBAL(vmode_g->height);
-    int linesize = DIV_ROUND_UP(width * vga_bpp(vmode_g), 8);
+    int linesize = vgahw_get_linesize(vmode_g);
     SET_FARVAR(seg, info->bytes_per_scanline, linesize);
     SET_FARVAR(seg, info->xres, width);
     SET_FARVAR(seg, info->yres, height);
diff --git a/vgasrc/vgahw.h b/vgasrc/vgahw.h
index dab2b4d..2a85eba 100644
--- a/vgasrc/vgahw.h
+++ b/vgasrc/vgahw.h
@@ -139,4 +139,10 @@ static inline int vgahw_save_restore(int cmd, u16 seg, void *data) {
     return stdvga_save_restore(cmd, seg, data);
 }
 
+static inline int vgahw_get_linesize(struct vgamode_s *vmode_g) {
+    if (CONFIG_VGA_COREBOOT)
+        return cbvga_get_linesize(vmode_g);
+    return stdvga_get_linesize(vmode_g);
+}
+
 #endif // vgahw.h
diff --git a/vgasrc/vgautil.h b/vgasrc/vgautil.h
index 08c4e8d..fae5fba 100644
--- a/vgasrc/vgautil.h
+++ b/vgasrc/vgautil.h
@@ -17,6 +17,7 @@ int cbvga_get_dacformat(struct vgamode_s *vmode_g);
 int cbvga_set_dacformat(struct vgamode_s *vmode_g, int val);
 int cbvga_save_restore(int cmd, u16 seg, void *data);
 int cbvga_set_mode(struct vgamode_s *vmode_g, int flags);
+int cbvga_get_linesize(struct vgamode_s *vmode_g);
 int cbvga_setup(void);
 
 // clext.c
@@ -63,6 +64,7 @@ void stdvga_list_modes(u16 seg, u16 *dest, u16 *last);
 void stdvga_build_video_param(void);
 void stdvga_override_crtc(int mode, u8 *crtc);
 int stdvga_set_mode(struct vgamode_s *vmode_g, int flags);
+int stdvga_get_linesize(struct vgamode_s *vmode_g);
 void stdvga_set_packed_palette(void);
 
 // swcursor.c
-- 
2.9.3


_______________________________________________
SeaBIOS mailing list
SeaBIOS@seabios.org
https://mail.coreboot.org/mailman/listinfo/seabios
[SeaBIOS] [PATCH 4/5] SeaVGABios/cbvga: Use active mode to clear screen
Posted by Patrick Rudolph, 16 weeks ago
As coreboot framebuffer is immutable always use CBmodeinfo.

Signed-off-by: Patrick Rudolph <siro@das-labor.org>
---
 vgasrc/cbvga.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vgasrc/cbvga.c b/vgasrc/cbvga.c
index 6b3233e..ae2bd4a 100644
--- a/vgasrc/cbvga.c
+++ b/vgasrc/cbvga.c
@@ -114,7 +114,7 @@ cbvga_set_mode(struct vgamode_s *vmode_g, int flags)
             return 0;
         }
         struct gfx_op op;
-        init_gfx_op(&op, vmode_g);
+        init_gfx_op(&op, &CBmodeinfo);
         op.x = op.y = 0;
         op.xlen = GET_GLOBAL(CBmodeinfo.width);
         op.ylen = GET_GLOBAL(CBmodeinfo.height);
-- 
2.9.3


_______________________________________________
SeaBIOS mailing list
SeaBIOS@seabios.org
https://mail.coreboot.org/mailman/listinfo/seabios
[SeaBIOS] [PATCH 5/5] SeaVGABios/cbvga: Advertise compatible VESA modes
Posted by Patrick Rudolph, 16 weeks ago
Advertise compatible VESA modes, that are smaller or equal to
coreboot's active framebuffer. Only modes that have the same Bpp
are advertise and can be selected.

Allows the Windows 7 bootloader NTLDR to show up in VESA mode.
Allows to show the Windows 7 boot logo.
Allows Windows to boot in safe mode and in normal boot using
VgaSave driver with resolution up to 1600x1200.

This fixes most likely other bootloader and operating systems as well,
in case the are relying on VESA framebuffer support.

v2: Invalidate modes in cbvga_setup.

Signed-off-by: Patrick Rudolph <siro@das-labor.org>
---
 vgasrc/cbvga.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)

diff --git a/vgasrc/cbvga.c b/vgasrc/cbvga.c
index ae2bd4a..42a50f7 100644
--- a/vgasrc/cbvga.c
+++ b/vgasrc/cbvga.c
@@ -19,8 +19,73 @@ static struct vgamode_s CBmodeinfo VAR16;
 static struct vgamode_s CBemulinfo VAR16;
 static u32 CBlinelength VAR16;
 
+static struct cbvga_mode_s
+{
+    u16 mode;
+    struct vgamode_s info;
+} cbvesa_modes[] VAR16 = {
+    /* VESA 1.0 modes */
+    { 0x110, { MM_DIRECT, 640,  480,  15, 8, 16, SEG_GRAPH } },
+    { 0x111, { MM_DIRECT, 640,  480,  16, 8, 16, SEG_GRAPH } },
+    { 0x112, { MM_DIRECT, 640,  480,  24, 8, 16, SEG_GRAPH } },
+    { 0x113, { MM_DIRECT, 800,  600,  15, 8, 16, SEG_GRAPH } },
+    { 0x114, { MM_DIRECT, 800,  600,  16, 8, 16, SEG_GRAPH } },
+    { 0x115, { MM_DIRECT, 800,  600,  24, 8, 16, SEG_GRAPH } },
+    { 0x116, { MM_DIRECT, 1024, 768,  15, 8, 16, SEG_GRAPH } },
+    { 0x117, { MM_DIRECT, 1024, 768,  16, 8, 16, SEG_GRAPH } },
+    { 0x118, { MM_DIRECT, 1024, 768,  24, 8, 16, SEG_GRAPH } },
+    { 0x119, { MM_DIRECT, 1280, 1024, 15, 8, 16, SEG_GRAPH } },
+    { 0x11A, { MM_DIRECT, 1280, 1024, 16, 8, 16, SEG_GRAPH } },
+    { 0x11B, { MM_DIRECT, 1280, 1024, 24, 8, 16, SEG_GRAPH } },
+    { 0x11D, { MM_DIRECT, 1600, 1200, 15, 8, 16, SEG_GRAPH } },
+    { 0x11E, { MM_DIRECT, 1600, 1200, 16, 8, 16, SEG_GRAPH } },
+    { 0x11F, { MM_DIRECT, 1600, 1200, 24, 8, 16, SEG_GRAPH } },
+    /* VESA 2.0 modes */
+    { 0x141, { MM_DIRECT, 640,  400,  32, 8, 16, SEG_GRAPH } },
+    { 0x142, { MM_DIRECT, 640,  480,  32, 8, 16, SEG_GRAPH } },
+    { 0x143, { MM_DIRECT, 800,  600,  32, 8, 16, SEG_GRAPH } },
+    { 0x144, { MM_DIRECT, 1024, 768,  32, 8, 16, SEG_GRAPH } },
+    { 0x145, { MM_DIRECT, 1280, 1024, 32, 8, 16, SEG_GRAPH } },
+    { 0x147, { MM_DIRECT, 1600, 1200, 32, 8, 16, SEG_GRAPH } },
+    { 0x149, { MM_DIRECT, 1152, 864,  15, 8, 16, SEG_GRAPH } },
+    { 0x14a, { MM_DIRECT, 1152, 864,  16, 8, 16, SEG_GRAPH } },
+    { 0x14b, { MM_DIRECT, 1152, 864,  24, 8, 16, SEG_GRAPH } },
+    { 0x14c, { MM_DIRECT, 1152, 864,  32, 8, 16, SEG_GRAPH } },
+    { 0x175, { MM_DIRECT, 1280, 768,  16, 8, 16, SEG_GRAPH } },
+    { 0x176, { MM_DIRECT, 1280, 768,  24, 8, 16, SEG_GRAPH } },
+    { 0x177, { MM_DIRECT, 1280, 768,  32, 8, 16, SEG_GRAPH } },
+    { 0x178, { MM_DIRECT, 1280, 800,  16, 8, 16, SEG_GRAPH } },
+    { 0x179, { MM_DIRECT, 1280, 800,  24, 8, 16, SEG_GRAPH } },
+    { 0x17a, { MM_DIRECT, 1280, 800,  32, 8, 16, SEG_GRAPH } },
+    { 0x17b, { MM_DIRECT, 1280, 960,  16, 8, 16, SEG_GRAPH } },
+    { 0x17c, { MM_DIRECT, 1280, 960,  24, 8, 16, SEG_GRAPH } },
+    { 0x17d, { MM_DIRECT, 1280, 960,  32, 8, 16, SEG_GRAPH } },
+    { 0x17e, { MM_DIRECT, 1440, 900,  16, 8, 16, SEG_GRAPH } },
+    { 0x17f, { MM_DIRECT, 1440, 900,  24, 8, 16, SEG_GRAPH } },
+    { 0x180, { MM_DIRECT, 1440, 900,  32, 8, 16, SEG_GRAPH } },
+    { 0x181, { MM_DIRECT, 1400, 1050, 16, 8, 16, SEG_GRAPH } },
+    { 0x182, { MM_DIRECT, 1400, 1050, 24, 8, 16, SEG_GRAPH } },
+    { 0x183, { MM_DIRECT, 1400, 1050, 32, 8, 16, SEG_GRAPH } },
+    { 0x184, { MM_DIRECT, 1680, 1050, 16, 8, 16, SEG_GRAPH } },
+    { 0x185, { MM_DIRECT, 1680, 1050, 24, 8, 16, SEG_GRAPH } },
+    { 0x186, { MM_DIRECT, 1680, 1050, 32, 8, 16, SEG_GRAPH } },
+    { 0x187, { MM_DIRECT, 1920, 1200, 16, 8, 16, SEG_GRAPH } },
+    { 0x188, { MM_DIRECT, 1920, 1200, 24, 8, 16, SEG_GRAPH } },
+    { 0x189, { MM_DIRECT, 1920, 1200, 32, 8, 16, SEG_GRAPH } },
+    { 0x18a, { MM_DIRECT, 2560, 1600, 16, 8, 16, SEG_GRAPH } },
+    { 0x18b, { MM_DIRECT, 2560, 1600, 24, 8, 16, SEG_GRAPH } },
+    { 0x18c, { MM_DIRECT, 2560, 1600, 32, 8, 16, SEG_GRAPH } },
+    { 0x18d, { MM_DIRECT, 1280, 720,  16, 8, 16, SEG_GRAPH } },
+    { 0x18e, { MM_DIRECT, 1280, 720,  24, 8, 16, SEG_GRAPH } },
+    { 0x18f, { MM_DIRECT, 1280, 720,  32, 8, 16, SEG_GRAPH } },
+    { 0x190, { MM_DIRECT, 1920, 1080, 16, 8, 16, SEG_GRAPH } },
+    { 0x191, { MM_DIRECT, 1920, 1080, 24, 8, 16, SEG_GRAPH } },
+    { 0x192, { MM_DIRECT, 1920, 1080, 32, 8, 16, SEG_GRAPH } },
+};
+
 struct vgamode_s *cbvga_find_mode(int mode)
 {
+    int i;
     /* Assume VGA compatible hardware in text-mode. */
     if (GET_GLOBAL(CBmode) == 0x3)
         return stdvga_find_mode(mode);
@@ -29,16 +94,45 @@ struct vgamode_s *cbvga_find_mode(int mode)
         return &CBmodeinfo;
     if (mode == 0x03)
         return &CBemulinfo;
+
+    for (i = 0; i < ARRAY_SIZE(cbvesa_modes); i++) {
+        struct cbvga_mode_s *cbmode_g = &cbvesa_modes[i];
+        if (GET_GLOBAL(cbmode_g->mode) == 0xffff)
+            continue;
+        if (GET_GLOBAL(cbmode_g->mode) == mode)
+            return &cbmode_g->info;
+    }
     return NULL;
 }
 
 void
 cbvga_list_modes(u16 seg, u16 *dest, u16 *last)
 {
+    int i;
 
     /* Assume VGA compatible hardware in text-mode. */
     if (GET_GLOBAL(CBmode) == 0x3) {
         stdvga_list_modes(seg, dest, last);
+    } else {
+        /* Advertise additional SVGA modes for Microsoft NTLDR graphical mode.
+         * Microsoft NTLDR:
+         * + Graphical mode uses a maximum resolution of 1600x1200.
+         * + Expects to find VESA mode with 800x600 or 1024x768.
+         * + 24 Bpp and 32 Bpp are supported
+         */
+        for (i = 0; i < ARRAY_SIZE(cbvesa_modes) && dest < last; i++) {
+            struct cbvga_mode_s *cbmode_g = &cbvesa_modes[i];
+            u16 mode = GET_GLOBAL(cbmode_g->mode);
+            if (mode == 0xffff)
+                continue;
+            SET_FARVAR(seg, *dest, mode);
+            dest++;
+        }
+        if (dest < last) {
+            SET_FARVAR(seg, *dest, GET_GLOBAL(CBmode));
+            dest++;
+        }
+        SET_FARVAR(seg, *dest, 0xffff);
     }
 }
 
@@ -154,6 +248,7 @@ struct cb_framebuffer {
 int
 cbvga_setup(void)
 {
+    int i;
     dprintf(1, "coreboot vga init\n");
 
     if (GET_GLOBAL(HaveRunInit))
@@ -208,5 +303,16 @@ cbvga_setup(void)
     memcpy_far(get_global_seg(), &CBemulinfo
                , get_global_seg(), &CBmodeinfo, sizeof(CBemulinfo));
 
+    // Validate modes
+    for (i = 0; i < ARRAY_SIZE(cbvesa_modes); i++) {
+        struct cbvga_mode_s *cbmode_g = &cbvesa_modes[i];
+        /* Skip VBE modes that doesn't fit into coreboot's framebuffer */
+        if ((GET_GLOBAL(cbmode_g->info.height) > ylines)
+            || (GET_GLOBAL(cbmode_g->info.width) > xlines)
+            || (GET_GLOBAL(cbmode_g->info.depth) != bpp)) {
+            dprintf(3, "Removing mode %x\n", GET_GLOBAL(cbmode_g->mode));
+            SET_VGA(cbmode_g->mode, 0xffff);
+        }
+    }
     return 0;
 }
-- 
2.9.3


_______________________________________________
SeaBIOS mailing list
SeaBIOS@seabios.org
https://mail.coreboot.org/mailman/listinfo/seabios