xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_crtc.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
diff-tree f2b13f1457bf860b075310d3962254be0ed7bea3 (from 5d044b9f74c7aa7e12f2822896fed881e2ca9d19)
Author: Alex Deucher <alex at botch2.(none)>
Date:   Sun Aug 26 13:27:19 2007 -0400

    RADEON: Only update pixclks_cntl when updating tv routing
    
    No need to re-set all of the pll2 stuff

diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index d42e482..6a4116d 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -752,6 +752,13 @@ RADEONInitPLL2Registers(ScrnInfoPtr pScr
 }
 
 static void
+radeon_update_tv_routing(ScrnInfoPtr pScrn, RADEONSavePtr restore)
+{
+    /* pixclks_cntl controls tv clock routing */
+    OUTPLL(pScrn, RADEON_PIXCLKS_CNTL, restore->pixclks_cntl);
+}
+
+static void
 radeon_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
 		     DisplayModePtr adjusted_mode, int x, int y)
 {
@@ -867,7 +874,7 @@ radeon_crtc_mode_set(xf86CrtcPtr crtc, D
 
     /* pixclks_cntl handles tv-out clock routing */
     if (update_tv_routing)
-	RADEONRestorePLL2Registers(pScrn, &info->ModeReg);
+	radeon_update_tv_routing(pScrn, &info->ModeReg);
 
     if (info->DispPriority)
         RADEONInitDispBandwidth(pScrn);