xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_crtc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e7b41f8cb082ed462d29bf3fc440072424cbd852
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri Mar 5 19:16:11 2010 -0500

    radeon: disable frac fb div with new pll code
    
    fixes fdo bug 26897

diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index 0635c91..0b071b8 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -461,8 +461,8 @@ RADEONComputePLL(ScrnInfoPtr pScrn,
 
     if (IS_AVIVO_VARIANT) {
 	if (xf86ReturnOptValBool(info->Options, OPTION_NEW_PLL, TRUE)) {
-	    /* to match previous behavior */
-	    flags |= RADEON_PLL_USE_FRAC_FB_DIV;
+	    /* disable frac fb dividers */
+	    flags &= ~RADEON_PLL_USE_FRAC_FB_DIV;
 	    RADEONComputePLL_new(pll, freq, chosen_dot_clock_freq,
 				 chosen_feedback_div, chosen_frac_feedback_div,
 				 chosen_reference_div, chosen_post_div, flags);