aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrzej Zaborowski <balrog@zabor.org>2009-08-23 19:00:58 +0200
committerAndrzej Zaborowski <balrog@zabor.org>2009-08-23 19:00:58 +0200
commit4445b0a62432a6402bbca8ba753679c70c98b522 (patch)
treeae5e0a6def8677747ea133c18a6dfc90d9ca318b /hw/vmware_vga.c
parentFix segfault of qemu-system-arm with PXA target (diff)
downloadqemu-kvm-4445b0a62432a6402bbca8ba753679c70c98b522.tar.gz
qemu-kvm-4445b0a62432a6402bbca8ba753679c70c98b522.tar.bz2
qemu-kvm-4445b0a62432a6402bbca8ba753679c70c98b522.zip
Revert my commit c00a9de060124a988bd9847c095e5836488c6f01
was incorrect.
Diffstat (limited to 'hw/vmware_vga.c')
-rw-r--r--hw/vmware_vga.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
index c473c3fc0..5ceebf196 100644
--- a/hw/vmware_vga.c
+++ b/hw/vmware_vga.c
@@ -923,7 +923,7 @@ static void vmsvga_reset(struct vmsvga_state_s *s)
s->width = -1;
s->height = -1;
s->svgaid = SVGA_ID;
- s->depth = ds_get_bits_per_pixel(s->vga.ds);
+ s->depth = 24;
s->bypp = (s->depth + 7) >> 3;
s->cursor.on = 0;
s->redraw_fifo_first = 0;
@@ -1126,6 +1126,8 @@ static void vmsvga_init(struct vmsvga_state_s *s, int vga_ram_size)
s->scratch_size = SVGA_SCRATCH_SIZE;
s->scratch = (uint32_t *) qemu_malloc(s->scratch_size * 4);
+ vmsvga_reset(s);
+
#ifdef EMBED_STDVGA
vga_common_init((VGAState *) s, vga_ram_size);
vga_init((VGAState *) s);
@@ -1140,8 +1142,6 @@ static void vmsvga_init(struct vmsvga_state_s *s, int vga_ram_size)
vmsvga_screen_dump,
vmsvga_text_update, &s->vga);
- vmsvga_reset(s);
-
#ifdef CONFIG_BOCHS_VBE
/* XXX: use optimized standard vga accesses */
cpu_register_physical_memory(VBE_DISPI_LFB_PHYSICAL_ADDRESS,