diff options
Diffstat (limited to 'vgasrc/cbvga.c')
| -rw-r--r-- | vgasrc/cbvga.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vgasrc/cbvga.c b/vgasrc/cbvga.c index 78ff968..b919137 100644 --- a/vgasrc/cbvga.c +++ b/vgasrc/cbvga.c @@ -13,7 +13,7 @@ #include "vgabios.h" // SET_VGA #include "vgafb.h" // handle_gfx_op #include "vgautil.h" // VBE_total_memory -#include "svgamodes.h" // svga_modes
+#include "svgamodes.h" // svga_modes static int CBmode VAR16; static struct vgamode_s CBmodeinfo VAR16; @@ -28,8 +28,8 @@ struct vgamode_s *cbvga_find_mode(int mode) return &CBemulinfo; int i; - for (i = 0; i < GET_GLOBAL(svga_mcount); i++) {
- struct generic_svga_mode *cbmode_g = &svga_modes[i];
+ for (i = 0; i < GET_GLOBAL(svga_mcount); i++) { + struct generic_svga_mode *cbmode_g = &svga_modes[i]; if (GET_GLOBAL(cbmode_g->mode) == 0xffff) continue; if (GET_GLOBAL(cbmode_g->mode) == mode) @@ -51,8 +51,8 @@ cbvga_list_modes(u16 seg, u16 *dest, u16 *last) * + 24 Bpp and 32 Bpp are supported */ int i; - for (i = 0; i < GET_GLOBAL(svga_mcount) && dest < last; i++) {
- struct generic_svga_mode *cbmode_g = &svga_modes[i];
+ for (i = 0; i < GET_GLOBAL(svga_mcount) && dest < last; i++) { + struct generic_svga_mode *cbmode_g = &svga_modes[i]; u16 mode = GET_GLOBAL(cbmode_g->mode); if (mode == 0xffff) continue; @@ -202,11 +202,11 @@ cbvga_setup_modes(u64 addr, u8 bpp, u32 xlines, u32 ylines, u32 linelength) , get_global_seg(), &CBmodeinfo, sizeof(CBemulinfo)); // Validate modes - for (i = 0; i < GET_GLOBAL(svga_mcount); i++) {
- struct generic_svga_mode *cbmode_g = &svga_modes[i];
+ for (i = 0; i < GET_GLOBAL(svga_mcount); i++) { + struct generic_svga_mode *cbmode_g = &svga_modes[i]; /* Skip VBE modes that doesn't fit into coreboot's framebuffer */ - if ((GET_GLOBAL(cbmode_g->info.memmodel) != MM_DIRECT)
- || (GET_GLOBAL(cbmode_g->info.height) > ylines)
+ if ((GET_GLOBAL(cbmode_g->info.memmodel) != MM_DIRECT) + || (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)); |