xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/atombios_crtc.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 808c90a24c48da7fa97e15e2f12be5bb8fd8cc96
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Jun 11 16:09:40 2009 -0400

    Only enable frac fb divs on rs600/rs690/rs740 for now
    
    fixes bug 21413

diff --git a/src/atombios_crtc.c b/src/atombios_crtc.c
index ae7e65e..d3fb62b 100644
--- a/src/atombios_crtc.c
+++ b/src/atombios_crtc.c
@@ -276,7 +276,10 @@ atombios_crtc_set_pll(xf86CrtcPtr crtc, DisplayModePtr mode)
 
     memset(&spc_param, 0, sizeof(spc_param));
     if (IS_AVIVO_VARIANT) {
-	pll_flags |= RADEON_PLL_USE_FRAC_FB_DIV | RADEON_PLL_PREFER_CLOSEST_LOWER;
+	if ((info->ChipFamily == CHIP_FAMILY_RS600) ||
+	    (info->ChipFamily == CHIP_FAMILY_RS690) ||
+	    (info->ChipFamily == CHIP_FAMILY_RS740))
+	    pll_flags |= RADEON_PLL_USE_FRAC_FB_DIV | RADEON_PLL_PREFER_CLOSEST_LOWER;
 	if (IS_DCE3_VARIANT && mode->Clock > 200000) /* range limits??? */
 	    pll_flags |= RADEON_PLL_PREFER_HIGH_FB_DIV;
 	else