diff options
| author | George Sapountzis <gsap7@yahoo.gr> | 2006-12-27 21:16:18 +0200 |
|---|---|---|
| committer | George Sapountzis <gsap7@yahoo.gr> | 2007-01-28 01:24:18 +0200 |
| commit | 817b4b5338dba4d8eb862f1f79ef0edb75aad7f4 (patch) | |
| tree | a787118664483b774bf30a3dd54aa87a2379b80d /src/atiprint.c | |
| parent | d350860e29f043e98bfb1da74b26280f1755ab6f (diff) | |
Keep PCI mach64 only, drop:
- Chip < ATI_CHIP_88800GXC
- Chipset != ATI_CHIPSET_ATI
- Adapter != ATI_ADAPTER_MACH64
- depth < 8
Diffstat (limited to 'src/atiprint.c')
| -rw-r--r-- | src/atiprint.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/atiprint.c b/src/atiprint.c index 247252d4..1fc629da 100644 --- a/src/atiprint.c +++ b/src/atiprint.c @@ -365,7 +365,7 @@ ATIPrintRegisters #ifndef AVOID_CPIO - CARD8 genmo, seq1 = 0; + CARD8 genmo; crtc = ATI_CRTC_VGA; @@ -469,8 +469,7 @@ ATIPrintRegisters ATIPrintIndexedRegisters(SEQX, 0, 8, "Sequencer", 0); if (pATI->CPIO_VGAWonder) - ATIPrintIndexedRegisters(pATI->CPIO_VGAWonder, - xf86ServerIsOnlyProbing() ? 0x80U : pATI->VGAOffset, 0xC0U, + ATIPrintIndexedRegisters(pATI->CPIO_VGAWonder, 0x80U, 0xC0U, "ATI extended VGA", 0); } @@ -540,13 +539,6 @@ ATIPrintRegisters xf86ErrorFVerb(4, "\n"); } else - -#ifndef AVOID_CPIO - - if (pATI->Chip >= ATI_CHIP_88800GXC) - -#endif /* AVOID_CPIO */ - { #ifdef AVOID_CPIO @@ -609,14 +601,6 @@ ATIPrintRegisters ATISetDACIOPorts(pATI, crtc); - /* Temporarily turn off CLKDIV2 while reading DAC's LUT */ - if (pATI->Adapter == ATI_ADAPTER_NONISA) - { - seq1 = GetReg(SEQX, 0x01U); - if (seq1 & 0x08U) - PutReg(SEQX, 0x01U, seq1 & ~0x08U); - } - dac_read = inb(pATI->CPIO_DAC_READ); DACDelay; dac_write = inb(pATI->CPIO_DAC_WRITE); @@ -653,9 +637,6 @@ ATIPrintRegisters outb(pATI->CPIO_DAC_READ, dac_read); DACDelay; - if ((pATI->Adapter == ATI_ADAPTER_NONISA) && (seq1 & 0x08U)) - PutReg(SEQX, 0x01U, seq1); - #endif /* AVOID_CPIO */ if ((pVideo = pATI->PCIInfo)) |