aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2005-03-30 16:42:14 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-03-30 16:42:14 -0800
commit47b343b318bdc258739c3c4c486fa1d8fbcab12b (patch)
treed84ebf2e3c8b9e7a75949150aebf32288d01a3c8
parentf55b27076a1c00b1374cd22cb295d7671eff27ee (diff)
downloadhistory-47b343b318bdc258739c3c4c486fa1d8fbcab12b.tar.gz
[PATCH] radeonfb: DDC i2c fix
The radeonfb code for DDC probing (like it's X.org counterpart) uses to leave the DDC clock & data lines asserted after the probing is complete. This causes problems with some Apple monitors like the new Cinema HD 23", who will turn themselves off when that happens. This fixes it. 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_i2c.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c
index e87ef153d87bb4..762244164c81a9 100644
--- a/drivers/video/aty/radeon_i2c.c
+++ b/drivers/video/aty/radeon_i2c.c
@@ -236,6 +236,12 @@ int radeon_probe_i2c_connector(struct radeonfb_info *rinfo, int conn, u8 **out_e
if (edid)
break;
}
+ /* Release the DDC lines when done or the Apple Cinema HD display
+ * will switch off
+ */
+ OUTREG(reg, INREG(reg) & ~(VGA_DDC_CLK_OUT_EN | VGA_DDC_DATA_OUT_EN));
+ (void)INREG(reg);
+
if (out_edid)
*out_edid = edid;
if (!edid) {