From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JqQnU-0004iC-Vo
	for qemu-devel@nongnu.org; Mon, 28 Apr 2008 06:41:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JqQnO-0004h3-Q8
	for qemu-devel@nongnu.org; Mon, 28 Apr 2008 06:41:20 -0400
Received: from [199.232.76.173] (port=52312 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JqQnN-0004gr-VW
	for qemu-devel@nongnu.org; Mon, 28 Apr 2008 06:41:18 -0400
Received: from smtp.eu.citrix.com ([62.200.22.115])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <samuel.thibault@labri.fr>) id 1JqQnN-0003Rp-Jf
	for qemu-devel@nongnu.org; Mon, 28 Apr 2008 06:41:17 -0400
Received: from samy by implementation.famille.thibault.fr with local (Exim
	4.69) (envelope-from <samuel.thibault@labri.fr>) id 1JqQnL-0002Xr-Q7
	for qemu-devel@nongnu.org; Mon, 28 Apr 2008 12:41:15 +0200
Date: Mon, 28 Apr 2008 11:41:15 +0100
From: Samuel Thibault <samuel.thibault@eu.citrix.com>
Message-ID: <20080428104115.GF4537@implementation.uk.xensource.com>
References: <20080428103248.GE4537@implementation.uk.xensource.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20080428103248.GE4537@implementation.uk.xensource.com>
Subject: [Qemu-devel] Re: [PATCH] Fix spurious VGA updates
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

Samuel Thibault, le Mon 28 Apr 2008 11:32:49 +0100, a écrit :
> VGA used to use
>     bwidth = width * 4;
> to detect how much memory it should check for dirtyness for each line to
> be updated. This is however only valid in 32bit modes. The patch below
> fixes that by using the exact number of bytes.

Oops, sorry, width is used for bwidth, not disp_width, so that even in
double width mode, bits should be 4, please use patch below instead.

Index: hw/vga.c
===================================================================
--- hw/vga.c	(révision 4276)
+++ hw/vga.c	(copie de travail)
@@ -1418,7 +1418,7 @@
 static void vga_draw_graphic(VGAState *s, int full_update)
 {
     int y1, y, update, page_min, page_max, linesize, y_start, double_scan, mask;
-    int width, height, shift_control, line_offset, page0, page1, bwidth;
+    int width, height, shift_control, line_offset, page0, page1, bwidth, bits;
     int disp_width, multi_scan, multi_run;
     uint8_t *d;
     uint32_t v, addr1, addr;
@@ -1454,6 +1454,7 @@
         } else {
             v = VGA_DRAW_LINE4;
         }
+        bits = 4;
     } else if (shift_control == 1) {
         full_update |= update_palette16(s);
         if (s->sr[0x01] & 8) {
@@ -1462,28 +1463,35 @@
         } else {
             v = VGA_DRAW_LINE2;
         }
+        bits = 4;
     } else {
         switch(s->get_bpp(s)) {
         default:
         case 0:
             full_update |= update_palette256(s);
             v = VGA_DRAW_LINE8D2;
+            bits = 4;
             break;
         case 8:
             full_update |= update_palette256(s);
             v = VGA_DRAW_LINE8;
+            bits = 8;
             break;
         case 15:
             v = VGA_DRAW_LINE15;
+            bits = 16;
             break;
         case 16:
             v = VGA_DRAW_LINE16;
+            bits = 16;
             break;
         case 24:
             v = VGA_DRAW_LINE24;
+            bits = 24;
             break;
         case 32:
             v = VGA_DRAW_LINE32;
+            bits = 32;
             break;
         }
     }
@@ -1507,7 +1515,7 @@
            width, height, v, line_offset, s->cr[9], s->cr[0x17], s->line_compare, s->sr[0x01]);
 #endif
     addr1 = (s->start_addr * 4);
-    bwidth = width * 4;
+    bwidth = (width * bits + 7) / 8;
     y_start = -1;
     page_min = 0x7fffffff;
     page_max = -1;