OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

cirrus: stop dirty logging during remaps (Jan Kiszka)

Browse Source 
Cleaned-up port from kvm-userspace: We have to stop any vram logging
while doing remaps. Otherwise the logger gets confused. This reward is
enormously accelerated cirrus vga in kvm mode.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6383 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2009-01-21 18:31:16 +00:00
parent ee50c6bc61
commit ba7349cd5d
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hw/cirrus_vga.c
View File

@ -2620,12 +2620,12 @@ static CPUWriteMemoryFunc *cirrus_linear_bitblt_write[3] = {
static void map_linear_vram(CirrusVGAState *s) static void map_linear_vram(CirrusVGAState *s)
{ {
vga_dirty_log_stop((VGAState *)s);
if (!s->map_addr && s->lfb_addr && s->lfb_end) { if (!s->map_addr && s->lfb_addr && s->lfb_end) {
s->map_addr = s->lfb_addr; s->map_addr = s->lfb_addr;
s->map_end = s->lfb_end; s->map_end = s->lfb_end;
cpu_register_physical_memory(s->map_addr, s->map_end - s->map_addr, s->vram_offset); cpu_register_physical_memory(s->map_addr, s->map_end - s->map_addr, s->vram_offset);
vga_dirty_log_start((VGAState *)s);
} }
if (!s->map_addr) if (!s->map_addr)
@ -2644,24 +2644,26 @@ static void map_linear_vram(CirrusVGAState *s)
(s->vram_offset + s->cirrus_bank_base[1]) | IO_MEM_RAM); (s->vram_offset + s->cirrus_bank_base[1]) | IO_MEM_RAM);
s->lfb_vram_mapped = 1; s->lfb_vram_mapped = 1;
vga_dirty_log_start((VGAState *)s);
} }
else { else {
cpu_register_physical_memory(isa_mem_base + 0xa0000, 0x8000, s->vga_io_memory); cpu_register_physical_memory(isa_mem_base + 0xa0000, 0x8000, s->vga_io_memory);
cpu_register_physical_memory(isa_mem_base + 0xa8000, 0x8000, s->vga_io_memory); cpu_register_physical_memory(isa_mem_base + 0xa8000, 0x8000, s->vga_io_memory);
} }
vga_dirty_log_start((VGAState *)s);
} }
static void unmap_linear_vram(CirrusVGAState *s) static void unmap_linear_vram(CirrusVGAState *s)
{ {
if (s->map_addr && s->lfb_addr && s->lfb_end) { vga_dirty_log_stop((VGAState *)s);
vga_dirty_log_stop((VGAState *)s);
if (s->map_addr && s->lfb_addr && s->lfb_end)
s->map_addr = s->map_end = 0; s->map_addr = s->map_end = 0;
}
cpu_register_physical_memory(isa_mem_base + 0xa0000, 0x20000, cpu_register_physical_memory(isa_mem_base + 0xa0000, 0x20000,
s->vga_io_memory); s->vga_io_memory);
vga_dirty_log_start((VGAState *)s);
} }
/* Compute the memory access functions */ /* Compute the memory access functions */
@ -3317,6 +3319,8 @@ static void cirrus_pci_lfb_map(PCIDevice *d, int region_num,
{ {
CirrusVGAState *s = &((PCICirrusVGAState *)d)->cirrus_vga; CirrusVGAState *s = &((PCICirrusVGAState *)d)->cirrus_vga;
vga_dirty_log_stop((VGAState *)s);
/* XXX: add byte swapping apertures */ /* XXX: add byte swapping apertures */
cpu_register_physical_memory(addr, s->vram_size, cpu_register_physical_memory(addr, s->vram_size,
s->cirrus_linear_io_addr); s->cirrus_linear_io_addr);
@ -3329,6 +3333,8 @@ static void cirrus_pci_lfb_map(PCIDevice *d, int region_num,
/* account for overflow */ /* account for overflow */
if (s->lfb_end < addr + VGA_RAM_SIZE) if (s->lfb_end < addr + VGA_RAM_SIZE)
s->lfb_end = addr + VGA_RAM_SIZE; s->lfb_end = addr + VGA_RAM_SIZE;
vga_dirty_log_start((VGAState *)s);
} }
static void cirrus_pci_mmio_map(PCIDevice *d, int region_num, static void cirrus_pci_mmio_map(PCIDevice *d, int region_num,
@ -3340,6 +3346,22 @@ static void cirrus_pci_mmio_map(PCIDevice *d, int region_num,
s->cirrus_mmio_io_addr); s->cirrus_mmio_io_addr);
} }
static void pci_cirrus_write_config(PCIDevice *d,
uint32_t address, uint32_t val, int len)
{
PCICirrusVGAState *pvs = container_of(d, PCICirrusVGAState, dev);
CirrusVGAState *s = &pvs->cirrus_vga;
vga_dirty_log_stop((VGAState *)s);
pci_default_write_config(d, address, val, len);
if (s->map_addr && pvs->dev.io_regions[0].addr == -1)
s->map_addr = 0;
cirrus_update_memory_access(s);
vga_dirty_log_start((VGAState *)s);
}
void pci_cirrus_vga_init(PCIBus *bus, uint8_t *vga_ram_base, void pci_cirrus_vga_init(PCIBus *bus, uint8_t *vga_ram_base,
ram_addr_t vga_ram_offset, int vga_ram_size) ram_addr_t vga_ram_offset, int vga_ram_size)
{ {
@ -3353,7 +3375,7 @@ void pci_cirrus_vga_init(PCIBus *bus, uint8_t *vga_ram_base,
/* setup PCI configuration registers */ /* setup PCI configuration registers */
d = (PCICirrusVGAState *)pci_register_device(bus, "Cirrus VGA", d = (PCICirrusVGAState *)pci_register_device(bus, "Cirrus VGA",
sizeof(PCICirrusVGAState), sizeof(PCICirrusVGAState),
-1, NULL, NULL); -1, NULL, pci_cirrus_write_config);
pci_conf = d->dev.config; pci_conf = d->dev.config;
pci_conf[0x00] = (uint8_t) (PCI_VENDOR_CIRRUS & 0xff); pci_conf[0x00] = (uint8_t) (PCI_VENDOR_CIRRUS & 0xff);
pci_conf[0x01] = (uint8_t) (PCI_VENDOR_CIRRUS >> 8); pci_conf[0x01] = (uint8_t) (PCI_VENDOR_CIRRUS >> 8);