diff options
| author | George Sapountzis <gsap7@yahoo.gr> | 2008-02-07 18:01:59 +0200 |
|---|---|---|
| committer | George Sapountzis <gsap7@yahoo.gr> | 2008-02-07 18:01:59 +0200 |
| commit | f7ed807f0d82a7446ebc4acdd4e94df44a675f19 (patch) | |
| tree | 262ce3c36e9b7eabb7e352e99b71d007fdb97431 /src/atipreinit.c | |
| parent | cda1cd198f33c26ef1b51532a2126468369743b8 (diff) | |
mach64: cosmetic
Diffstat (limited to 'src/atipreinit.c')
| -rw-r--r-- | src/atipreinit.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/atipreinit.c b/src/atipreinit.c index d01bb9c2..65c84eb5 100644 --- a/src/atipreinit.c +++ b/src/atipreinit.c @@ -144,10 +144,6 @@ ati_bios_clock { CARD16 ClockDac; - /* Set up non-zero defaults */ - pATI->ClockDescriptor = ATIClockDescriptors[ATI_CLOCK_FIXED]; - pATI->ClockNumberToProgramme = -1; - if (ClockTable > 0) { pATI->ProgrammableClock = BIOSByte(ClockTable); @@ -208,6 +204,8 @@ ati_bios_clock pATI->ClockNumberToProgramme = 3; } + pATI->ClockDescriptor = ATIClockDescriptors[ATI_CLOCK_FIXED]; + if ((pATI->ProgrammableClock > ATI_CLOCK_FIXED) && (pATI->ProgrammableClock < ATI_CLOCK_MAX)) { @@ -220,8 +218,7 @@ ati_bios_clock (pATI->DAC == ATI_DAC_IBMRGB514)) pATI->ProgrammableClock = ATI_CLOCK_IBMRGB514; - pATI->ClockDescriptor = - ATIClockDescriptors[pATI->ProgrammableClock]; + pATI->ClockDescriptor = ATIClockDescriptors[pATI->ProgrammableClock]; } ClockDac = pATI->DAC; @@ -234,14 +231,13 @@ ati_bios_clock */ if (ClockTable > 0) pATI->ClockDescriptor.MinM = - pATI->ClockDescriptor.MaxM = - BIOSWord(ClockTable + 0x0AU); + pATI->ClockDescriptor.MaxM = BIOSWord(ClockTable + 0x0AU); else if (!xf86NameCmp(pGDev->clockchip, "ATI 18818-0")) pATI->ClockDescriptor.MinM = - pATI->ClockDescriptor.MaxM = 43; + pATI->ClockDescriptor.MaxM = 43; else if (!xf86NameCmp(pGDev->clockchip, "ATI 18818-1")) pATI->ClockDescriptor.MinM = - pATI->ClockDescriptor.MaxM = 46; + pATI->ClockDescriptor.MaxM = 46; else pATI->ProgrammableClock = ATI_CLOCK_UNKNOWN; break; @@ -269,8 +265,8 @@ ati_bios_clock * effectively prevents generating frequencies beyond the * graphics controller's tolerance. */ - pATI->ClockDescriptor.MinM = pATI->ClockDescriptor.MaxM = - ATIMach64GetPLLReg(PLL_REF_DIV); + pATI->ClockDescriptor.MinM = + pATI->ClockDescriptor.MaxM = ATIMach64GetPLLReg(PLL_REF_DIV); /* The DAC is also integrated */ if ((pATI->DAC & ~0x0FU) != ATI_DAC_INTERNAL) @@ -308,8 +304,7 @@ ati_bios_clock if (pATI->DAC == ATI_DAC_IBMRGB514) { pATI->ProgrammableClock = ATI_CLOCK_IBMRGB514; - pATI->ClockDescriptor = - ATIClockDescriptors[ATI_CLOCK_IBMRGB514]; + pATI->ClockDescriptor = ATIClockDescriptors[ATI_CLOCK_IBMRGB514]; pATI->ClockNumberToProgramme = 7; } else |