From d350860e29f043e98bfb1da74b26280f1755ab6f Mon Sep 17 00:00:00 2001 From: George Sapountzis Date: Wed, 27 Dec 2006 20:56:45 +0200 Subject: Keep PCI mach64 only (atipreinit.c, atimode.c), drop: - Chip < ATI_CHIP_88800GXC - Chipset != ATI_CHIPSET_ATI - Adapter != ATI_ADAPTER_MACH64 - depth < 8 atimode.c only: - NewHW.crtc != ATI_CRTC_MACH64 This allows to drop VGACalculate(), VGAWonderCalculate() cruft early. --- src/ativalid.c | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'src/ativalid.c') diff --git a/src/ativalid.c b/src/ativalid.c index c2539a2d..25ad7182 100644 --- a/src/ativalid.c +++ b/src/ativalid.c @@ -48,7 +48,6 @@ ATIValidMode { ScrnInfoPtr pScreenInfo = xf86Screens[iScreen]; ATIPtr pATI = ATIPTR(pScreenInfo); - Bool InterlacedSeen; int HBlankWidth, HAdjust, VScan, VInterlace; #ifndef AVOID_CPIO @@ -59,31 +58,6 @@ ATIValidMode if (flags & MODECHECK_FINAL) { - /* - * This is the final check before the common layer accepts a mode. - * pScreenInfo->displayWidth is set to the proposed virtual pitch - * should the mode be accepted. The only check needed here is for - * 18800's and 28800's, which don't support interlaced modes if the - * pitch is over half the chipset's maximum pitch. - */ - if (pATI->MaximumInterlacedPitch) - { - /* - * Ensure no interlaced modes have a scanline pitch larger than the - * limit. - */ - if (pMode->Flags & V_INTERLACE) - InterlacedSeen = TRUE; - else - InterlacedSeen = pATI->InterlacedSeen; - - if (InterlacedSeen && - (pScreenInfo->displayWidth > pATI->MaximumInterlacedPitch)) - return MODE_INTERLACE_WIDTH; - - pATI->InterlacedSeen = InterlacedSeen; - } - return MODE_OK; } @@ -214,12 +188,6 @@ ATIValidMode if ((VDisplay > 2048) || (VTotal > 2050)) return MODE_BAD_VVALUE; - if (pATI->Adapter != ATI_ADAPTER_VGA) - break; - - if ((VDisplay > 1024) || (VTotal > 1025)) - return MODE_BAD_VVALUE; - break; #endif /* AVOID_CPIO */ -- cgit v1.2.3