[Qemu-devel] [6882] Fix VGA issue introduced by r6349 malc

[Anthony Liguori]

Revision: 6882
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6882
Author:   aliguori
Date:     2009-03-22 02:59:21 +0000 (Sun, 22 Mar 2009)
Log Message:
-----------
Fix VGA issue introduced by r6349 (malc)

Thanks to Robert Riebisch for bisection

Signed-off-by: Anthony Liguori <aliguori@xxxxxxxxxx>

Modified Paths:
--------------
    branches/stable_0_10/hw/vga.c

Modified: branches/stable_0_10/hw/vga.c
===================================================================
--- branches/stable_0_10/hw/vga.c       2009-03-21 23:04:14 UTC (rev 6881)
+++ branches/stable_0_10/hw/vga.c       2009-03-22 02:59:21 UTC (rev 6882)
@@ -1616,6 +1616,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 ||
@@ -1661,7 +1671,6 @@
         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 @@
         full_update |= update_palette16(s);
         if (s->sr[0x01] & 8) {
             v = VGA_DRAW_LINE2D2;
-            disp_width <<= 1;
         } else {
             v = VGA_DRAW_LINE2;
         }