From: malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Tue, 17 Mar 2009 16:05:50 +0000 (+0000)
Subject: Fix VGA issue introduced by r6349
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=aba35a6cd1c70f8cb4b9a08d6685eafe76725cee;p=qemu.git

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
---

diff --git a/hw/vga.c b/hw/vga.c
index e3d244642e..eeb77f1ff3 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;
         }