From 30b15843b21dc7573772ced9c045937426e73a87 Mon Sep 17 00:00:00 2001 From: aliguori Date: Sun, 22 Mar 2009 02:59:21 +0000 Subject: [PATCH] Fix VGA issue introduced by r6349 (malc) Thanks to Robert Riebisch for bisection Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@6882 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 044b339161..2a9f4d9de4 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -1616,6 +1616,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 || @@ -1661,7 +1671,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; } @@ -1670,7 +1679,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.11.4.GIT