xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_atombios.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 6aedd57f6c2f08d0151a8bd1c5893d40d3db709a
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue May 4 14:30:52 2010 -0400

    radeon: fix pll_out_min default for pre-avivo
    
    Fixes fdo bug 27960

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 42b35d0..30dbaf6 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -2289,9 +2289,12 @@ RADEONGetATOMClockInfo(ScrnInfoPtr pScrn)
 	break;
     }
     pll->reference_div = 0;
-    if (pll->pll_out_min == 0)
-	pll->pll_out_min = 64800;
-
+    if (pll->pll_out_min == 0) {
+	if (IS_AVIVO_VARIANT)
+	    pll->pll_out_min = 64800;
+	else
+	    pll->pll_out_min = 20000;
+    }
 
     /* limiting the range is a good thing in most cases
      * as it limits the number of matching pll combinations,