From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ljbnp-0008IJ-KS
	for qemu-devel@nongnu.org; Tue, 17 Mar 2009 12:06:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ljbnn-0008HU-VP
	for qemu-devel@nongnu.org; Tue, 17 Mar 2009 12:06:05 -0400
Received: from [199.232.76.173] (port=55434 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ljbnn-0008HQ-RK
	for qemu-devel@nongnu.org; Tue, 17 Mar 2009 12:06:03 -0400
Received: from savannah.gnu.org ([199.232.41.3]:54002 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <av1474@comtv.ru>) id 1Ljbnn-0001Eh-0G
	for qemu-devel@nongnu.org; Tue, 17 Mar 2009 12:06:03 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <av1474@comtv.ru>) id 1Ljbnb-0002Y8-I5
	for qemu-devel@nongnu.org; Tue, 17 Mar 2009 16:05:51 +0000
Received: from malc by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <malc@savannah.gnu.org>) id 1Ljbnb-0002Y4-6L
	for qemu-devel@nongnu.org; Tue, 17 Mar 2009 16:05:51 +0000
MIME-Version: 1.0
Errors-To: malc
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: malc <av1474@comtv.ru>
Message-Id: <E1Ljbnb-0002Y4-6L@cvs.savannah.gnu.org>
Date: Tue, 17 Mar 2009 16:05:51 +0000
Subject: [Qemu-devel] [6858] Fix VGA issue introduced by r6349
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

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