diff options
| author | George Sapountzis <gsap7@yahoo.gr> | 2006-11-20 20:38:59 +0200 |
|---|---|---|
| committer | George Sapountzis <gsap7@yahoo.gr> | 2007-01-28 01:24:20 +0200 |
| commit | 9b126f45db27496c1ad16db65a61fe641a018983 (patch) | |
| tree | b2b1aa10abfb1ce153bea711a447b187eb85fd8e /src/aticlock.c | |
| parent | 0abcb2b2c84a50e64bb6aa9e94760659ecf33add (diff) | |
We always use the accelerator CRTC within the xserver.
- cull (pATI->NewHW.crtc != ATI_CRTC_MACH64).
Diffstat (limited to 'src/aticlock.c')
| -rw-r--r-- | src/aticlock.c | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/src/aticlock.c b/src/aticlock.c index f5bfbba..05c3a6d 100644 --- a/src/aticlock.c +++ b/src/aticlock.c @@ -564,18 +564,6 @@ ATIClockPreInit pScreenInfo->progClock = TRUE; /* Set internal clock ordering */ - -#ifndef AVOID_CPIO - - if (pATI->NewHW.crtc == ATI_CRTC_VGA) - { - pATI->NewHW.ClockMap = ATIVGAProgrammableClockMap; - pATI->NewHW.ClockUnmap = ATIVGAProgrammableClockUnmap; - } - else - -#endif /* AVOID_CPIO */ - { pATI->NewHW.ClockMap = ATIProgrammableClockMap; pATI->NewHW.ClockUnmap = ATIProgrammableClockUnmap; @@ -654,18 +642,6 @@ ProbeClocks: * When selecting clocks, all ATI accelerators use a different * clock ordering. */ - -#ifndef AVOID_CPIO - - if (pATI->NewHW.crtc == ATI_CRTC_VGA) - { - pATI->NewHW.ClockMap = ATIMachVGAClockMap; - pATI->NewHW.ClockUnmap = ATIMachVGAClockUnmap; - } - else - -#endif /* AVOID_CPIO */ - { pATI->NewHW.ClockMap = ATIAcceleratorClockMap; pATI->NewHW.ClockUnmap = ATIAcceleratorClockUnmap; @@ -1275,43 +1251,9 @@ ATIClockCalculate pATIHW->clock = ClockSelect; /* Save pre-map clock number */ ClockSelect = MapClockIndex(pATIHW->ClockMap, ClockSelect); - switch (pATIHW->crtc) { - -#ifndef AVOID_CPIO - - case ATI_CRTC_VGA: - pATIHW->genmo = (pATIHW->genmo & 0xF3U) | - ((ClockSelect << 2) & 0x0CU); - - if (pATI->CPIO_VGAWonder) - { - /* Set ATI clock select bits */ - { - pATIHW->be = (pATIHW->be & 0xEFU) | - ((ClockSelect << 2) & 0x10U); - { - ClockSelect >>= 1; - pATIHW->b9 = (pATIHW->b9 & 0xFDU) | - ((ClockSelect >> 1) & 0x02U); - } - } - - /* Set clock divider bits */ - pATIHW->b8 = (pATIHW->b8 & 0x3FU) | - ((ClockSelect << 3) & 0xC0U); - } - break; - -#endif /* AVOID_CPIO */ - - case ATI_CRTC_MACH64: pATIHW->clock_cntl = CLOCK_STROBE | SetBits(ClockSelect, CLOCK_SELECT | CLOCK_DIVIDER); - break; - - default: - break; } return TRUE; |