david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert my commit c00a9de060124a988bd9847c095e5836488c6f01

Browse Source 
was incorrect.
This commit is contained in:
Andrzej Zaborowski 2009-08-23 19:00:58 +02:00
parent 8d30b794ce
commit 4445b0a624
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/vmware_vga.c
View File

@ -923,7 +923,7 @@ static void vmsvga_reset(struct vmsvga_state_s *s)
s->width = -1; s->width = -1;
s->height = -1; s->height = -1;
s->svgaid = SVGA_ID; s->svgaid = SVGA_ID;
s->depth = ds_get_bits_per_pixel(s->vga.ds); s->depth = 24;
s->bypp = (s->depth + 7) >> 3; s->bypp = (s->depth + 7) >> 3;
s->cursor.on = 0; s->cursor.on = 0;
s->redraw_fifo_first = 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_size = SVGA_SCRATCH_SIZE;
s->scratch = (uint32_t *) qemu_malloc(s->scratch_size * 4); s->scratch = (uint32_t *) qemu_malloc(s->scratch_size * 4);
vmsvga_reset(s);
#ifdef EMBED_STDVGA #ifdef EMBED_STDVGA
vga_common_init((VGAState *) s, vga_ram_size); vga_common_init((VGAState *) s, vga_ram_size);
vga_init((VGAState *) s); 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_screen_dump,
vmsvga_text_update, &s->vga); vmsvga_text_update, &s->vga);
vmsvga_reset(s);
#ifdef CONFIG_BOCHS_VBE #ifdef CONFIG_BOCHS_VBE
/* XXX: use optimized standard vga accesses */ /* XXX: use optimized standard vga accesses */
cpu_register_physical_memory(VBE_DISPI_LFB_PHYSICAL_ADDRESS, cpu_register_physical_memory(VBE_DISPI_LFB_PHYSICAL_ADDRESS,