diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:59 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:59 +0000 |
| commit | 2eab4a4e2b8f2ec2154738f0dd57cf0dc5c7816a (patch) | |
| tree | add0e49232de50548191a4243ed0d32cc91d1ec5 /src/atidsp.c | |
| parent | 770358c0804c3e919440d2575e4ef25365f763b6 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'src/atidsp.c')
| -rw-r--r-- | src/atidsp.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/atidsp.c b/src/atidsp.c index 7ca2329..103d3dd 100644 --- a/src/atidsp.c +++ b/src/atidsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atidsp.c,v 1.19 2003/01/01 19:16:31 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atidsp.c,v 1.21 2003/09/24 02:43:18 dawes Exp $ */ /* * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * @@ -51,7 +51,7 @@ ATIDSPPreInit pATI->ClockDescriptor.NumD = 8; /* Retrieve XCLK settings */ - IOValue = ATIGetMach64PLLReg(PLL_XCLK_CNTL); + IOValue = ATIMach64GetPLLReg(PLL_XCLK_CNTL); pATI->XCLKPostDivider = GetBits(IOValue, PLL_XCLK_SRC_SEL); pATI->XCLKReferenceDivider = 1; switch (pATI->XCLKPostDivider) @@ -71,10 +71,10 @@ ATIDSPPreInit } pATI->XCLKPostDivider -= GetBits(IOValue, PLL_MFB_TIMES_4_2B); - pATI->XCLKFeedbackDivider = ATIGetMach64PLLReg(PLL_MCLK_FB_DIV); + pATI->XCLKFeedbackDivider = ATIMach64GetPLLReg(PLL_MCLK_FB_DIV); xf86DrvMsgVerb(iScreen, X_INFO, 2, - "Engine XCLK %.3f MHz; Refresh rate code %d.\n", + "Engine XCLK %.3f MHz; Refresh rate code %ld.\n", ATIDivide(pATI->XCLKFeedbackDivider * pATI->ReferenceNumerator, pATI->XCLKReferenceDivider * pATI->ClockDescriptor.MaxM * pATI->ReferenceDenominator, 1 - pATI->XCLKPostDivider, 0) / @@ -100,7 +100,9 @@ ATIDSPPreInit { case MEM_264_DRAM: if (pATI->VideoRAM <= 1024) + { pATI->DisplayLoopLatency = 10; + } else { pATI->DisplayLoopLatency = 8; @@ -111,7 +113,9 @@ ATIDSPPreInit case MEM_264_EDO: case MEM_264_PSEUDO_EDO: if (pATI->VideoRAM <= 1024) + { pATI->DisplayLoopLatency = 9; + } else { pATI->DisplayLoopLatency = 8; @@ -121,7 +125,9 @@ ATIDSPPreInit case MEM_264_SDRAM: if (pATI->VideoRAM <= 1024) + { pATI->DisplayLoopLatency = 11; + } else { pATI->DisplayLoopLatency = 10; |