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/atiadjust.c | |
| parent | 0abcb2b2c84a50e64bb6aa9e94760659ecf33add (diff) | |
We always use the accelerator CRTC within the xserver.
- cull (pATI->NewHW.crtc != ATI_CRTC_MACH64).
Diffstat (limited to 'src/atiadjust.c')
| -rw-r--r-- | src/atiadjust.c | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/src/atiadjust.c b/src/atiadjust.c index dfbd2102..f01fee69 100644 --- a/src/atiadjust.c +++ b/src/atiadjust.c @@ -27,7 +27,6 @@ #include "ati.h" #include "atiadjust.h" #include "atichip.h" -#include "aticrtc.h" #include "atilock.h" #include "atimach64io.h" #include "atiwonderio.h" @@ -65,35 +64,8 @@ ATIAdjustPreInit 1); } - switch (pATI->NewHW.crtc) { - -#ifndef AVOID_CPIO - - case ATI_CRTC_VGA: - if (pATI->Chip >= ATI_CHIP_264CT) - { - pATI->AdjustMaxBase = MaxBits(CRTC_OFFSET_VGA) << 2; - } - else if (!pATI->CPIO_VGAWonder) - { - pATI->AdjustMaxBase = 0xFFFFU << 3; - } - else /* Mach32 & Mach64 */ - { - pATI->AdjustMaxBase = 0x0FFFFFU << 3; - } - break; - -#endif /* AVOID_CPIO */ - - case ATI_CRTC_MACH64: pATI->AdjustMaxBase = MaxBits(CRTC_OFFSET) << 3; - break; - - default: - pATI->AdjustMaxBase = 0; - break; } MaxBase = (pATI->AdjustMaxBase / (unsigned long)pATI->AdjustDepth) | @@ -155,38 +127,7 @@ ATIAdjustFrame /* Unlock registers */ ATIUnlock(pATI); -#ifndef AVOID_CPIO - - if ((pATI->NewHW.crtc == ATI_CRTC_VGA) && (pATI->Chip < ATI_CHIP_264CT)) - { - PutReg(CRTX(pATI->CPIO_VGABase), 0x0CU, GetByte(Base, 1)); - PutReg(CRTX(pATI->CPIO_VGABase), 0x0DU, GetByte(Base, 0)); - - if (pATI->CPIO_VGAWonder) - { - ATIModifyExtReg(pATI, 0xB0U, -1, 0xBFU, Base >> 10); - ATIModifyExtReg(pATI, 0xA3U, -1, 0xEFU, Base >> 13); - - /* - * I don't know if this also applies to Mach64's, but give it a - * shot... - */ - ATIModifyExtReg(pATI, 0xADU, -1, 0xF3U, Base >> 16); - } - } - else - -#endif /* AVOID_CPIO */ - { - -#ifndef AVOID_CPIO - - if (pATI->NewHW.crtc == ATI_CRTC_VGA) - Base <<= 1; /* LSBit must be zero */ - -#endif /* AVOID_CPIO */ - outr(CRTC_OFF_PITCH, SetBits(pATI->displayWidth >> 3, CRTC_PITCH) | SetBits(Base, CRTC_OFFSET)); } |