From 399075649e5f9c00397e11940a52d735933f4958 Mon Sep 17 00:00:00 2001 From: malc Date: Tue, 17 Mar 2009 16:05:50 +0000 Subject: [PATCH] Fix VGA issue introduced by r6349 Thanks to Robert Riebisch for bisection git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6858 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/vga.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/hw/vga.c b/hw/vga.c index e3d2446..eeb77f1 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -1619,6 +1619,16 @@ static void vga_draw_graphic(VGAState *s, int full_update) s->double_scan = double_scan; } + if (shift_control == 0) { + if (s->sr[0x01] & 8) { + disp_width <<= 1; + } + } else if (shift_control == 1) { + if (s->sr[0x01] & 8) { + disp_width <<= 1; + } + } + depth = s->get_bpp(s); if (s->line_offset != s->last_line_offset || disp_width != s->last_width || @@ -1660,7 +1670,6 @@ static void vga_draw_graphic(VGAState *s, int full_update) full_update |= update_palette16(s); if (s->sr[0x01] & 8) { v = VGA_DRAW_LINE4D2; - disp_width <<= 1; } else { v = VGA_DRAW_LINE4; } @@ -1669,7 +1678,6 @@ static void vga_draw_graphic(VGAState *s, int full_update) full_update |= update_palette16(s); if (s->sr[0x01] & 8) { v = VGA_DRAW_LINE2D2; - disp_width <<= 1; } else { v = VGA_DRAW_LINE2; } -- 2.7.4