summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Deucher <alex@botch2.(none)>2007-08-26 13:27:19 -0400
committerAlex Deucher <alex@botch2.(none)>2007-08-26 13:27:19 -0400
commitf2b13f1457bf860b075310d3962254be0ed7bea3 (patch)
treeb0850fef56e61136d8b75804f12278ba00c88952 /src
parent5d044b9f74c7aa7e12f2822896fed881e2ca9d19 (diff)
RADEON: Only update pixclks_cntl when updating tv routing
No need to re-set all of the pll2 stuff
Diffstat (limited to 'src')
-rw-r--r--src/radeon_crtc.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index d42e4829..6a4116df 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -752,6 +752,13 @@ RADEONInitPLL2Registers(ScrnInfoPtr pScrn, RADEONSavePtr save,
}
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, DisplayModePtr mode,
/* 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);