xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_bios.c |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit c7e6a50f60a04bbbf1c1ddbf4738a5f75c94f950
Author: Alex Deucher <alex at botchco.com>
Date:   Wed May 28 09:05:19 2008 -0400

    RADEON: only attempt to read vbios from legacy ISA space if it's primary

diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index bc041c3..fa8305c 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)