aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2005-03-30 16:49:28 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-03-30 16:49:28 -0800
commit391438fa4d4e36caac092fe7cd2dfa7a26ef7519 (patch)
tree04815d8263e550fd1f4584744a49538d231f66da
parentcb487640f5f09fa2c31b418d3036628c974b99b7 (diff)
downloadhistory-391438fa4d4e36caac092fe7cd2dfa7a26ef7519.tar.gz
[PATCH] radeonfb: Preserve TMDS setting
radeonfb tends to override TMDS_TRANSMITTER_CNTL completely, which appears to be incorrect with some recent flat panels. This patch changes this so that we only tweak the bits we want in there and preserve the BIOS value for the rest. Along with the i2c fix, that patch fixes operations on the latest Apple cinema displays. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/video/aty/radeon_base.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 409a78e34f43d4..e8eb124754b136 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -1743,8 +1743,7 @@ static int radeonfb_set_par(struct fb_info *info)
} else {
/* DFP */
newmode->fp_gen_cntl |= (FP_FPON | FP_TMDS_EN);
- newmode->tmds_transmitter_cntl = (TMDS_RAN_PAT_RST | TMDS_ICHCSEL) &
- ~(TMDS_PLLRST);
+ newmode->tmds_transmitter_cntl &= ~(TMDS_PLLRST);
/* TMDS_PLL_EN bit is reversed on RV (and mobility) chips */
if (IS_R300_VARIANT(rinfo) ||
(rinfo->family == CHIP_FAMILY_R200) || !rinfo->has_CRTC2)