diff options
| author | Roland Mainz <roland.mainz@nrubsig.org> | 2004-12-15 08:47:20 +0000 |
|---|---|---|
| committer | Roland Mainz <roland.mainz@nrubsig.org> | 2004-12-15 08:47:20 +0000 |
| commit | f45f665ec9b93e150d7249bf0128bce618afc8ae (patch) | |
| tree | daadcc8a36063b07d224f956c78c755f06562ace | |
| parent | ba4af626981384e648c0b29b22ffc214361b1c39 (diff) | |
xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile
//bugs.freedesktop.org/show_bug.cgi?id=1962) attachment #1423
(https://bugs.freedesktop.org/attachment.cgi?id=1423): Avoid PIO access
on IA64. Some IA64 machine check if legacy ports outside the VGA range
are accessed. The ATi driver however does this to probe for ISA
Mach8/32/64. Since no IA64 has ISA slots this restriction should not be
relevant to the user. Patch by Egbert Eich <eich@freedesktop.org>
| -rw-r--r-- | src/atiprobe.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/atiprobe.c b/src/atiprobe.c index e262a824..c7dff498 100644 --- a/src/atiprobe.c +++ b/src/atiprobe.c @@ -1243,6 +1243,10 @@ ATIProbe xf86MsgVerb(X_INFO, 2, ATI_NAME ": Unshared VGA not probed.\n"); } + /* + * Mach8/32 probing doesn't work well on some legacy free ia64 + * However if we use AVOID_CPIO we don't get here at all. + */ if (ATICheckSparseIOBases(NULL, ProbeFlags, 0x02E8U, 8, fChipsets[ATI_CHIPSET_IBM8514] || fChipsets[ATI_CHIPSET_MACH8] || @@ -1275,6 +1279,10 @@ ATIProbe ATI_NAME ": Unshared 8514/A not probed.\n"); } + /* + * Also NONPCI Mach64 probing is evil on legacy free platforms. + * However if we use AVOID_CPIO we don't get here at all. + */ for (i = 0; i < NumberOf(Mach64SparseIOBases); i++) { if (ATICheckSparseIOBases(NULL, ProbeFlags, Mach64SparseIOBases[i], @@ -1309,7 +1317,6 @@ ATIProbe ATIClaimSparseIOBases(ProbeFlags, Mach64SparseIOBases[i], 4, DetectedMach64); } - #endif /* AVOID_NON_PCI */ } @@ -1539,7 +1546,6 @@ ATIProbe ATIFindVGA(pVideo, &pVGA, &pATI, p8514, ProbeFlags); } - xf86SetPciVideo(NULL, NONE); break; } |