diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-01-01 21:27:46 +0100 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2015-01-06 09:53:39 -0500 |
| commit | 9c29148ea6e2ba0c1ca81f92138a4f71e5f8d6d7 (patch) | |
| tree | e0f9134d585e2970fc242d8d29572c7a63a01518 /vgasrc | |
| parent | 6f86b8936edb948bb878e36f4a1761a5b124594e (diff) | |
| download | qemu-seabios-9c29148ea6e2ba0c1ca81f92138a4f71e5f8d6d7.tar.gz | |
vgabios: fix graphics operation with Bochs VGA in non-DISPI modes
For legacy VGA modes that do not set the VBE_DISPI_ENABLED bit,
bochsvga_get_linelength returns 0. Thus all characters are squashed
into the first scanline. Fix this by falling back to stdvga for
the legacy modes.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'vgasrc')
| -rw-r--r-- | vgasrc/bochsvga.c | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c index 5313f54..ee6f437 100644 --- a/vgasrc/bochsvga.c +++ b/vgasrc/bochsvga.c @@ -151,10 +151,21 @@ static inline void dispi_write(u16 reg, u16 val) outw(val, VBE_DISPI_IOPORT_DATA); } +static u8 +bochsvga_dispi_enabled(void) +{ + if (!GET_GLOBAL(dispi_found)) + return 0; + u16 en = dispi_read(VBE_DISPI_INDEX_ENABLE); + if (!(en & VBE_DISPI_ENABLED)) + return 0; + return 1; +} + int bochsvga_get_window(struct vgamode_s *vmode_g, int window) { - if (!GET_GLOBAL(dispi_found)) + if (!bochsvga_dispi_enabled()) return stdvga_get_window(vmode_g, window); if (window != 0) return -1; @@ -164,7 +175,7 @@ bochsvga_get_window(struct vgamode_s *vmode_g, int window) int bochsvga_set_window(struct vgamode_s *vmode_g, int window, int val) { - if (!GET_GLOBAL(dispi_found)) + if (!bochsvga_dispi_enabled()) return stdvga_set_window(vmode_g, window, val); if (window != 0) return -1; @@ -177,7 +188,7 @@ bochsvga_set_window(struct vgamode_s *vmode_g, int window, int val) int bochsvga_get_linelength(struct vgamode_s *vmode_g) { - if (!GET_GLOBAL(dispi_found)) + if (!bochsvga_dispi_enabled()) return stdvga_get_linelength(vmode_g); return dispi_read(VBE_DISPI_INDEX_VIRT_WIDTH) * vga_bpp(vmode_g) / 8; } @@ -186,7 +197,7 @@ int bochsvga_set_linelength(struct vgamode_s *vmode_g, int val) { stdvga_set_linelength(vmode_g, val); - if (GET_GLOBAL(dispi_found)) { + if (bochsvga_dispi_enabled()) { int pixels = (val * 8) / vga_bpp(vmode_g); dispi_write(VBE_DISPI_INDEX_VIRT_WIDTH, pixels); } @@ -196,7 +207,7 @@ bochsvga_set_linelength(struct vgamode_s *vmode_g, int val) int bochsvga_get_displaystart(struct vgamode_s *vmode_g) { - if (!GET_GLOBAL(dispi_found)) + if (!bochsvga_dispi_enabled()) return stdvga_get_displaystart(vmode_g); int bpp = vga_bpp(vmode_g); int linelength = dispi_read(VBE_DISPI_INDEX_VIRT_WIDTH) * bpp / 8; @@ -209,7 +220,7 @@ int bochsvga_set_displaystart(struct vgamode_s *vmode_g, int val) { stdvga_set_displaystart(vmode_g, val); - if (GET_GLOBAL(dispi_found)) { + if (bochsvga_dispi_enabled()) { int bpp = vga_bpp(vmode_g); int linelength = dispi_read(VBE_DISPI_INDEX_VIRT_WIDTH) * bpp / 8; if (!linelength) @@ -223,7 +234,7 @@ bochsvga_set_displaystart(struct vgamode_s *vmode_g, int val) int bochsvga_get_dacformat(struct vgamode_s *vmode_g) { - if (!GET_GLOBAL(dispi_found)) + if (!bochsvga_dispi_enabled()) return stdvga_get_dacformat(vmode_g); u16 en = dispi_read(VBE_DISPI_INDEX_ENABLE); return (en & VBE_DISPI_8BIT_DAC) ? 8 : 6; @@ -232,7 +243,7 @@ bochsvga_get_dacformat(struct vgamode_s *vmode_g) int bochsvga_set_dacformat(struct vgamode_s *vmode_g, int val) { - if (!GET_GLOBAL(dispi_found)) + if (!bochsvga_dispi_enabled()) return stdvga_set_dacformat(vmode_g, val); u16 en = dispi_read(VBE_DISPI_INDEX_ENABLE); if (val == 6) |