XLibre/xf86-video-r128
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-r128.git synced 2026-03-24 01:24:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

mach64: add hint for sparc and minor cosmetic.

Browse Source
This commit is contained in:
George Sapountzis
2008-01-26 19:28:05 +02:00
parent 09d713aa0e
commit b7de4ff52c
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/aticlock.c
View File

@@ -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;

5
src/atimach64xv.c
View File

@@ -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
{

14
src/atiprobe.c
View File

@@ -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;