starred/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-04-05 22:00:58 +00:00
Code Issues 380 Packages Projects Releases Wiki Activity

ati-vga: Add work around for fuloong2e

Browse Source 
With the linear aperture size fixed to match real card fuloong2e no
longer works due to running out of PCI memory because only one PCI bus
is emulated on that machine. Add a property to allow fuloong2e to set
a smaller linear aperture size to work around that problem until the
machine model is improved.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Chad Jablonski <chad@jablonski.xyz>
Message-ID: <47cbdc7ad2291f22467f9fc86e7287eb8983c927.1774110169.git.balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
BALATON Zoltan
2026-03-21 17:30:17 +01:00
committed by Philippe Mathieu-Daudé
parent b7c0d01719
commit c1315534f3
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
hw/display/ati.c
View File

@@ -1059,7 +1059,6 @@ static void ati_vga_realize(PCIDevice *dev, Error **errp)
ATIVGAState *s = ATI_VGA(dev);
VGACommonState *vga = &s->vga;
I2CBus *i2cbus;
uint64_t aper_size;
#ifndef CONFIG_PIXMAN
if (s->use_pixman != 0) {
@@ -1123,10 +1122,19 @@ static void ati_vga_realize(PCIDevice *dev, Error **errp)
* Rage128 the upper half of the aperture is reserved for an AGP
* window (which we do not emulate.)
*/
aper_size = s->dev_id == PCI_DEVICE_ID_ATI_RAGE128_PF ?
ATI_RAGE128_LINEAR_APER_SIZE : ATI_R100_LINEAR_APER_SIZE;
if (!s->linear_aper_sz) {
if (s->dev_id == PCI_DEVICE_ID_ATI_RAGE128_PF) {
s->linear_aper_sz = ATI_RAGE128_LINEAR_APER_SIZE;
} else {
s->linear_aper_sz = ATI_R100_LINEAR_APER_SIZE;
}
}
if (s->linear_aper_sz < 16 * MiB) {
error_setg(errp, "x-linear-aper-size is too small (minimum 16 MiB)");
return;
}
memory_region_init(&s->linear_aper, OBJECT(dev), "ati-linear-aperture0",
aper_size);
s->linear_aper_sz);
memory_region_add_subregion(&s->linear_aper, 0, &vga->vram);
pci_register_bar(dev, 0, PCI_BASE_ADDRESS_MEM_PREFETCH, &s->linear_aper);
@@ -1171,6 +1179,7 @@ static const Property ati_vga_properties[] = {
DEFINE_PROP_BOOL("guest_hwcursor", ATIVGAState, cursor_guest_mode, false),
/* this is a debug option, prefer PROP_UINT over PROP_BIT for simplicity */
DEFINE_PROP_UINT8("x-pixman", ATIVGAState, use_pixman, DEFAULT_X_PIXMAN),
DEFINE_PROP_UINT64("x-linear-aper-size", ATIVGAState, linear_aper_sz, 0),
DEFINE_EDID_PROPERTIES(ATIVGAState, i2cddc.edid_info),
};

1
hw/display/ati_int.h
View File

@@ -119,6 +119,7 @@ struct ATIVGAState {
QEMUTimer vblank_timer;
bitbang_i2c_interface bbi2c;
I2CDDCState i2cddc;
uint64_t linear_aper_sz;
MemoryRegion linear_aper;
MemoryRegion io;
MemoryRegion mm;

1
hw/mips/fuloong2e.c
View File

@@ -316,6 +316,7 @@ static void mips_fuloong2e_init(MachineState *machine)
dev = DEVICE(pci_dev);
qdev_prop_set_uint32(dev, "vgamem_mb", 16);
qdev_prop_set_uint16(dev, "x-device-id", 0x5159);
qdev_prop_set_uint64(dev, "x-linear-aper-size", 16 * MiB);
pci_realize_and_unref(pci_dev, pci_bus, &error_fatal);
}