summaryrefslogtreecommitdiff
path: root/src/atiprobe.c
diff options
context:
space:
mode:
authorGeorge Sapountzis <gsap7@yahoo.gr>2007-03-18 15:35:25 +0200
committerGeorge Sapountzis <gsap7@yahoo.gr>2007-03-21 20:18:49 +0200
commite7969de8ec572d8801806f9525a9a081a58a03f1 (patch)
tree48f39803ef42a20cfcd3c0a26100d4fb01c7c2eb /src/atiprobe.c
parent2d2fb54ba370c1df9ef5102e83c17a7ff5c55403 (diff)
[mach64] Drop poking the VGA MMIO aperture.
We will not be able to handle this when we do mappings for PCI BARs only and it should be handled with a CPIO driver anyway.
Diffstat (limited to 'src/atiprobe.c')
-rw-r--r--src/atiprobe.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/atiprobe.c b/src/atiprobe.c
index 4a70f81e..01c5763e 100644
--- a/src/atiprobe.c
+++ b/src/atiprobe.c
@@ -227,7 +227,10 @@ ATIMach64Probe
(pATI->Block0Base < (CARD32)(-1 << pVideo->size[2])))
{
pATI->Block0Base += 0x00000400U;
- goto LastProbe;
+ if (ATIMach64Detect(pATI, ChipType, Chip))
+ return pATI;
+
+ return NULL;
}
/*
@@ -246,17 +249,6 @@ ATIMach64Probe
return pATI;
}
- /*
- * A last, perhaps desparate, probe attempt. Note that if this succeeds,
- * there's a VGA in the system and it's likely the PIO version of the
- * driver should be used instead (barring OS issues).
- */
- pATI->Block0Base = 0x000BFC00U;
-
-LastProbe:
- if (ATIMach64Detect(pATI, ChipType, Chip))
- return pATI;
-
return NULL;
}