diff options
| author | Alex Deucher <alex@botchco.com> | 2008-05-28 09:05:19 -0400 |
|---|---|---|
| committer | Alex Deucher <alex@botchco.com> | 2008-05-28 09:05:19 -0400 |
| commit | c7e6a50f60a04bbbf1c1ddbf4738a5f75c94f950 (patch) | |
| tree | 7da9f69bd52bd6827d731bf0503f5c7507109f92 | |
| parent | faea008806802ec0e045754ec1eca492ebae320e (diff) | |
RADEON: only attempt to read vbios from legacy ISA space if it's primary
| -rw-r--r-- | src/radeon_bios.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/radeon_bios.c b/src/radeon_bios.c index bc041c3f..fa8305ce 100644 --- a/src/radeon_bios.c +++ b/src/radeon_bios.c @@ -81,12 +81,14 @@ radeon_read_bios(ScrnInfoPtr pScrn) if (info->VBIOS[0] != 0x55 || info->VBIOS[1] != 0xaa) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Video BIOS not detected in PCI space!\n"); - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Attempting to read Video BIOS from " - "legacy ISA space!\n"); - info->BIOSAddr = 0x000c0000; - xf86ReadDomainMemory(info->PciTag, info->BIOSAddr, - RADEON_VBIOS_SIZE, info->VBIOS); + if (xf86IsEntityPrimary(info->pEnt->index)) { + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "Attempting to read Video BIOS from " + "legacy ISA space!\n"); + info->BIOSAddr = 0x000c0000; + xf86ReadDomainMemory(info->PciTag, info->BIOSAddr, + RADEON_VBIOS_SIZE, info->VBIOS); + } } #endif if (info->VBIOS[0] != 0x55 || info->VBIOS[1] != 0xaa) |