View | Details | Raw Unified | Return to bug 151644
Collapse All | Expand All

(-)xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_bios.c.orig (-9 / +8 lines)
Lines 51-66 Bool RADEONGetBIOSInfo(ScrnInfoPtr pScrn Link Here
51
	    (void)memcpy(info->VBIOS, xf86int10Addr(pInt10, info->BIOSAddr),
51
	    (void)memcpy(info->VBIOS, xf86int10Addr(pInt10, info->BIOSAddr),
52
			 RADEON_VBIOS_SIZE);
52
			 RADEON_VBIOS_SIZE);
53
	} else {
53
	} else {
54
	    xf86ReadPciBIOS(0, info->PciTag, 0, info->VBIOS, RADEON_VBIOS_SIZE);
54
	    info->BIOSAddr = 0x000c0000;
55
	    xf86ReadDomainMemory(info->PciTag, info->BIOSAddr,
56
			 	RADEON_VBIOS_SIZE, info->VBIOS);
55
	    if (info->VBIOS[0] != 0x55 || info->VBIOS[1] != 0xaa) {
57
	    if (info->VBIOS[0] != 0x55 || info->VBIOS[1] != 0xaa) {
56
		xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
58
		xf86ReadPciBIOS(0, info->PciTag, -1, info->VBIOS, RADEON_VBIOS_SIZE);
57
			   "Video BIOS not detected in PCI space!\n");
59
		if (info->VBIOS[0] != 0x55 || info->VBIOS[1] != 0xaa) {
58
		xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
60
		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
59
			   "Attempting to read Video BIOS from "
61
			   "Video BIOS not detected!\n");
60
			   "legacy ISA space!\n");
62
		}
61
		info->BIOSAddr = 0x000c0000;
62
		xf86ReadDomainMemory(info->PciTag, info->BIOSAddr,
63
				     RADEON_VBIOS_SIZE, info->VBIOS);
64
	    }
63
	    }
65
	}
64
	}
66
    }
65
    }

Return to bug 151644