cirrus_vga: allow configurable vram size
Allow RAM size to be configurable for cirrus, to allow migration compatibility from qemu-kvm. Acked-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
parent
c3d3980794
commit
19403a68fb
|
@ -42,8 +42,6 @@
|
||||||
//#define DEBUG_CIRRUS
|
//#define DEBUG_CIRRUS
|
||||||
//#define DEBUG_BITBLT
|
//#define DEBUG_BITBLT
|
||||||
|
|
||||||
#define VGA_RAM_SIZE (8192 * 1024)
|
|
||||||
|
|
||||||
/***************************************
|
/***************************************
|
||||||
*
|
*
|
||||||
* definitions
|
* definitions
|
||||||
|
@ -2856,7 +2854,8 @@ static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci,
|
||||||
|
|
||||||
/* I/O handler for LFB */
|
/* I/O handler for LFB */
|
||||||
memory_region_init_io(&s->cirrus_linear_io, &cirrus_linear_io_ops, s,
|
memory_region_init_io(&s->cirrus_linear_io, &cirrus_linear_io_ops, s,
|
||||||
"cirrus-linear-io", VGA_RAM_SIZE);
|
"cirrus-linear-io", s->vga.vram_size_mb
|
||||||
|
* 1024 * 1024);
|
||||||
memory_region_set_flush_coalesced(&s->cirrus_linear_io);
|
memory_region_set_flush_coalesced(&s->cirrus_linear_io);
|
||||||
|
|
||||||
/* I/O handler for LFB */
|
/* I/O handler for LFB */
|
||||||
|
@ -2899,7 +2898,6 @@ static int vga_initfn(ISADevice *dev)
|
||||||
ISACirrusVGAState *d = DO_UPCAST(ISACirrusVGAState, dev, dev);
|
ISACirrusVGAState *d = DO_UPCAST(ISACirrusVGAState, dev, dev);
|
||||||
VGACommonState *s = &d->cirrus_vga.vga;
|
VGACommonState *s = &d->cirrus_vga.vga;
|
||||||
|
|
||||||
s->vram_size_mb = VGA_RAM_SIZE >> 20;
|
|
||||||
vga_common_init(s);
|
vga_common_init(s);
|
||||||
cirrus_init_common(&d->cirrus_vga, CIRRUS_ID_CLGD5430, 0,
|
cirrus_init_common(&d->cirrus_vga, CIRRUS_ID_CLGD5430, 0,
|
||||||
isa_address_space(dev));
|
isa_address_space(dev));
|
||||||
|
@ -2912,6 +2910,12 @@ static int vga_initfn(ISADevice *dev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static Property isa_vga_cirrus_properties[] = {
|
||||||
|
DEFINE_PROP_UINT32("vgamem_mb", struct ISACirrusVGAState,
|
||||||
|
cirrus_vga.vga.vram_size_mb, 8),
|
||||||
|
DEFINE_PROP_END_OF_LIST(),
|
||||||
|
};
|
||||||
|
|
||||||
static void isa_cirrus_vga_class_init(ObjectClass *klass, void *data)
|
static void isa_cirrus_vga_class_init(ObjectClass *klass, void *data)
|
||||||
{
|
{
|
||||||
ISADeviceClass *k = ISA_DEVICE_CLASS(klass);
|
ISADeviceClass *k = ISA_DEVICE_CLASS(klass);
|
||||||
|
@ -2919,6 +2923,7 @@ static void isa_cirrus_vga_class_init(ObjectClass *klass, void *data)
|
||||||
|
|
||||||
dc->vmsd = &vmstate_cirrus_vga;
|
dc->vmsd = &vmstate_cirrus_vga;
|
||||||
k->init = vga_initfn;
|
k->init = vga_initfn;
|
||||||
|
dc->props = isa_vga_cirrus_properties;
|
||||||
}
|
}
|
||||||
|
|
||||||
static TypeInfo isa_cirrus_vga_info = {
|
static TypeInfo isa_cirrus_vga_info = {
|
||||||
|
@ -2942,7 +2947,6 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev)
|
||||||
int16_t device_id = pc->device_id;
|
int16_t device_id = pc->device_id;
|
||||||
|
|
||||||
/* setup VGA */
|
/* setup VGA */
|
||||||
s->vga.vram_size_mb = VGA_RAM_SIZE >> 20;
|
|
||||||
vga_common_init(&s->vga);
|
vga_common_init(&s->vga);
|
||||||
cirrus_init_common(s, device_id, 1, pci_address_space(dev));
|
cirrus_init_common(s, device_id, 1, pci_address_space(dev));
|
||||||
s->vga.ds = graphic_console_init(s->vga.update, s->vga.invalidate,
|
s->vga.ds = graphic_console_init(s->vga.update, s->vga.invalidate,
|
||||||
|
@ -2969,6 +2973,12 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static Property pci_vga_cirrus_properties[] = {
|
||||||
|
DEFINE_PROP_UINT32("vgamem_mb", struct PCICirrusVGAState,
|
||||||
|
cirrus_vga.vga.vram_size_mb, 8),
|
||||||
|
DEFINE_PROP_END_OF_LIST(),
|
||||||
|
};
|
||||||
|
|
||||||
static void cirrus_vga_class_init(ObjectClass *klass, void *data)
|
static void cirrus_vga_class_init(ObjectClass *klass, void *data)
|
||||||
{
|
{
|
||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
|
@ -2982,6 +2992,7 @@ static void cirrus_vga_class_init(ObjectClass *klass, void *data)
|
||||||
k->class_id = PCI_CLASS_DISPLAY_VGA;
|
k->class_id = PCI_CLASS_DISPLAY_VGA;
|
||||||
dc->desc = "Cirrus CLGD 54xx VGA";
|
dc->desc = "Cirrus CLGD 54xx VGA";
|
||||||
dc->vmsd = &vmstate_pci_cirrus_vga;
|
dc->vmsd = &vmstate_pci_cirrus_vga;
|
||||||
|
dc->props = pci_vga_cirrus_properties;
|
||||||
}
|
}
|
||||||
|
|
||||||
static TypeInfo cirrus_vga_info = {
|
static TypeInfo cirrus_vga_info = {
|
||||||
|
|
Loading…
Reference in a new issue