summaryrefslogtreecommitdiff
path: root/src/atidsp.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:28:36 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:28:36 +0000
commit73105e438e90f950249cb265ba99001d4db3dc60 (patch)
treeadd0e49232de50548191a4243ed0d32cc91d1ec5 /src/atidsp.c
parent0a53864f9581196604d04fd28b4e94a9b0b73d18 (diff)
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'src/atidsp.c')
-rw-r--r--src/atidsp.c14
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;