xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_driver.c |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 20eedf348a527e1e0a5450bc22d7564895034a66
Author: Alex Deucher <alex at botch2.(none)>
Date:   Sun Dec 23 11:27:55 2007 -0500

    RADEON: fix pll input setup on mac cards
    
    the function was exiting before the complete setup was finished.

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 9c6c0e4..4e4f23e 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1231,19 +1231,18 @@ static void RADEONGetClockInfo(ScrnInfoPtr pScrn)
 	   pll->pll_out_max = 35000;
        }
 
-       if (RADEONProbePLLParameters(pScrn))
-	   return;
+       if (!RADEONProbePLLParameters(pScrn)) {
+	   if (info->IsIGP)
+	       pll->reference_freq = 1432;
+	   else
+	       pll->reference_freq = 2700;
 
-	if (info->IsIGP)
-	    pll->reference_freq = 1432;
-	else
-	    pll->reference_freq = 2700;
+	   pll->reference_div = 12;
+	   pll->xclk = 10300;
 
-	pll->reference_div = 12;
-	pll->xclk = 10300;
-
-        info->sclk = 200.00;
-        info->mclk = 200.00;
+	   info->sclk = 200.00;
+	   info->mclk = 200.00;
+       }
     }
 
     /* card limits for computing PLLs */