summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>2009-08-03 16:14:39 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-27 21:23:37 -0500
commit141bc15f548c19af086509a259f58b306b92be8f (patch)
treeb90256fcef59fb9df0825638ab098e4a4d341410
parent91730df4fbd51e04bafe3cab28c18f50ede9309f (diff)
downloadqemu-141bc15f548c19af086509a259f58b306b92be8f.tar.gz
vga: do not resize the screen on hw_invalidate
Hi all, currently vga always resizes the screen when vga_hw_invalidate is called while this is not required and all the other graphic emulators don't. This patch fixes it, making vga invalidate behaviour consistent with the other emulated devices. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Message-Id:
-rw-r--r--hw/vga.c6
-rw-r--r--hw/vga_int.h1
2 files changed, 4 insertions, 3 deletions
diff --git a/hw/vga.c b/hw/vga.c
index 91a6852f25..00ecc1b708 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -1837,7 +1837,8 @@ static void vga_update_display(void *opaque)
if (ds_get_bits_per_pixel(s->ds) == 0) {
/* nothing to do */
} else {
- full_update = 0;
+ full_update = s->full_update;
+ s->full_update = 0;
if (!(s->ar_index & 0x20)) {
graphic_mode = GMODE_BLANK;
} else {
@@ -1867,8 +1868,7 @@ static void vga_invalidate_display(void *opaque)
{
VGAState *s = (VGAState *)opaque;
- s->last_width = -1;
- s->last_height = -1;
+ s->full_update = 1;
}
void vga_reset(void *opaque)
diff --git a/hw/vga_int.h b/hw/vga_int.h
index 631b1b0fc3..8fdf51dc61 100644
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -158,6 +158,7 @@ typedef struct VGACommonState {
uint32_t last_width, last_height; /* in chars or pixels */
uint32_t last_scr_width, last_scr_height; /* in pixels */
uint32_t last_depth; /* in bits */
+ uint8_t full_update;
uint8_t cursor_start, cursor_end;
uint32_t cursor_offset;
unsigned int (*rgb_to_pixel)(unsigned int r,