Drop support for non-programmable clocks.

From README.ati:

Clocks for supported programmable clock generators:

  The driver currently supports all programmable clock generators known
  to exist on Mach64 adapters.

Clocks for unsupported programmable clock generators:

  This case is unlikely to occur, but is documented for the sake of
  completeness.

Thus:

- check for (pATI->ProgrammableClock > ATI_CLOCK_FIXED) &&
            (pATI->ProgrammableClock < ATI_CLOCK_MAX)

- drop "probe_clocks" option

- pATIHW->ClockUnmap is no longer used

- pATIHW->ClockMap is only used with NewHW.crtc which is always ATI_CRTC_MACH64
  and has the identity map, so drop it

- (pATI->ProgrammableClock != ATI_CLOCK_INTERNAL) => (pATI->depth <= 8)

1 files changed, 1 insertions, 20 deletions

diff --git a/src/aticlock.h b/src/aticlock.h
index b58b8246..1d3f1b9c 100644
--- a/src/aticlock.h
+++ b/src/aticlock.h
@@ -28,24 +28,6 @@
 #include "xf86str.h"
 
 /*
- * Definitions related to non-programmable clock generators.
- */
-typedef enum
-{
-    ATI_CLOCK_NONE = 0,
-    ATI_CLOCK_VGA = 1,
-    ATI_CLOCK_CRYSTALS = 2,
-    ATI_CLOCK_18810,
-    ATI_CLOCK_18811_0,
-    ATI_CLOCK_18811_1,
-    ATI_CLOCK_2494AM,
-    ATI_CLOCK_MACH64A,
-    ATI_CLOCK_MACH64B,
-    ATI_CLOCK_MACH64C
-} ATIClockType;
-extern const char *ATIClockNames[];
-
-/*
  * Definitions related to programmable clock generators.
  */
 typedef enum
@@ -73,8 +55,7 @@ typedef struct
 } ClockRec, *ClockPtr;
 extern ClockRec ATIClockDescriptors[];
 
-extern void ATIClockPreInit(ScrnInfoPtr, ATIPtr, GDevPtr, ClockRangePtr);
-extern void ATIClockSave(ScrnInfoPtr, ATIPtr, ATIHWPtr);
+extern void ATIClockPreInit(ScrnInfoPtr, ATIPtr);
 extern Bool ATIClockCalculate(int, ATIPtr, ATIHWPtr, DisplayModePtr);
 extern void ATIClockSet(ATIPtr, ATIHWPtr);