gwj / at91sam9263 · Commits

Commit 6f9bc132639d8d3349581441daa4f799c28d48fb

Authored by balrog
1 parent f54b3f92

Allocate the -vmwarevga framebuffer in the right place in RAM. 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4200 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 3 additions and 1 deletions
hw/vmware_vga.c
  View file @6f9bc13
... ... @@ -58,6 +58,7 @@ struct vmsvga_state_s {
58 58 #ifndef EMBED_STDVGA
59 59 DisplayState *ds;
60 60 int vram_size;
  61 + ram_addr_t vram_offset;
61 62 #endif
62 63 uint8_t *vram;
63 64 target_phys_addr_t vram_base;
... ... @@ -1114,6 +1115,7 @@ static void vmsvga_init(struct vmsvga_state_s *s, DisplayState *ds,
1114 1115 s->ds = ds;
1115 1116 s->vram = vga_ram_base;
1116 1117 s->vram_size = vga_ram_size;
  1118 + s->vram_offset = vga_ram_offset;
1117 1119  
1118 1120 s->scratch_size = SVGA_SCRATCH_SIZE;
1119 1121 s->scratch = (uint32_t *) qemu_malloc(s->scratch_size * 4);
... ... @@ -1186,7 +1188,7 @@ static void pci_vmsvga_map_mem(PCIDevice *pci_dev, int region_num,
1186 1188 iomemtype = cpu_register_io_memory(0, vmsvga_vram_read,
1187 1189 vmsvga_vram_write, s);
1188 1190 #else
1189   - iomemtype = 0 | IO_MEM_RAM;
  1191 + iomemtype = s->vram_offset | IO_MEM_RAM;
1190 1192 #endif
1191 1193 cpu_register_physical_memory(s->vram_base, s->vram_size,
1192 1194 iomemtype);
... ...