[Qemu-devel] [6858] Fix VGA issue introduced by r6349

[malc]

Revision: 6858
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6858
Author:   malc
Date:     2009-03-17 16:05:50 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
Fix VGA issue introduced by r6349

Thanks to Robert Riebisch for bisection

Modified Paths:
--------------
    trunk/hw/vga.c

Modified: trunk/hw/vga.c
===================================================================
--- trunk/hw/vga.c      2009-03-17 12:19:58 UTC (rev 6857)
+++ trunk/hw/vga.c      2009-03-17 16:05:50 UTC (rev 6858)
@@ -1619,6 +1619,16 @@
         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 @@
         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 @@
         full_update |= update_palette16(s);
         if (s->sr[0x01] & 8) {
             v = VGA_DRAW_LINE2D2;
-            disp_width <<= 1;
         } else {
             v = VGA_DRAW_LINE2;
         }