diff options
| -rw-r--r-- | src/aticlock.c | 10 | ||||
| -rw-r--r-- | src/atimach64xv.c | 5 | ||||
| -rw-r--r-- | src/atiprobe.c | 14 |
3 files changed, 20 insertions, 9 deletions
diff --git a/src/aticlock.c b/src/aticlock.c index 2aa65c48..8dd79d42 100644 --- a/src/aticlock.c +++ b/src/aticlock.c @@ -139,6 +139,16 @@ ATIClockPreInit (double)pATI->ReferenceNumerator / ((double)pATI->ReferenceDenominator * 1000.0)); +#if defined(__sparc__) + if (pATI->ReferenceNumerator != 315000 && + pATI->ReferenceDenominator != 11) + { + xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO, + "If modes do not work on Ultra 5/10 or Blade 100/150,\n" + "set option \"reference_clock\" to \"28.636 MHz\"\n"); + } +#endif + if (pATI->ProgrammableClock == ATI_CLOCK_CH8398) { /* First two are fixed */ pScreenInfo->numClocks = 2; diff --git a/src/atimach64xv.c b/src/atimach64xv.c index 67bececf..ef17861e 100644 --- a/src/atimach64xv.c +++ b/src/atimach64xv.c @@ -1385,7 +1385,7 @@ ATIMach64XVInitialiseAdaptor else if (pATI->Chip < ATI_CHIP_264GTPRO || pATI->Chip > ATI_CHIP_264LTPRO) { - /* Do nothing */ + enc->width = 720; /* default */ } else { @@ -1441,7 +1441,8 @@ ATIMach64XVInitialiseAdaptor else if (pATI->Chip < ATI_CHIP_264GTPRO || pATI->Chip > ATI_CHIP_264LTPRO) { - /* Do nothing */ + surf0->max_width = 720; /* default */ + surf1->max_width = 720; } else { diff --git a/src/atiprobe.c b/src/atiprobe.c index 70e1a4a6..ddfed31a 100644 --- a/src/atiprobe.c +++ b/src/atiprobe.c @@ -406,6 +406,13 @@ ATIMach64ProbeIO goto SkipSparse; } + /* Possibly fix block I/O indicator */ + if (PciReg & 0x00000004U) + { + PciReg &= ~0x00000004U; + PCI_WRITE_LONG(pVideo, PciReg, PCI_REG_USERCONFIG); + } + /* FIXME: * Should not probe at sparse I/O bases which have been registered to * other PCI devices. The old ATIProbe() would scan the PCI space and @@ -426,13 +433,6 @@ ATIMach64ProbeIO goto SkipSparse; } - /* Possibly fix block I/O indicator */ - if (PciReg & 0x00000004U) - { - PciReg &= ~0x00000004U; - PCI_WRITE_LONG(pVideo, PciReg, PCI_REG_USERCONFIG); - } - pATI->CPIOBase = Mach64SparseIOBases[j]; pATI->CPIODecoding = SPARSE_IO; pATI->PCIInfo = pVideo; |