diff options
author | Jean Delvare <khali@linux-fr.org> | 2008-10-16 01:03:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 14:21:41 -0400 |
commit | 319fcb224d66a4702731ec13b8ac670ad1e923bf (patch) | |
tree | cee39a4c00be0f1468bda6965448caf9aec27313 /drivers/video/aty/radeon_i2c.c | |
parent | 35e8bb5175c1a6ff6253f1a2acb30bfe52a2f500 (diff) |
radeonfb: revert "Fix radeon DDC regression"
The bug was in fb_ddc and was fixed by commit
b64d70825abbf706bbe80be1b11b09514b71f45e (fb_ddc: fix DDC lines quirk) so
the workaround in radeonfb can be removed now.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/aty/radeon_i2c.c')
-rw-r--r-- | drivers/video/aty/radeon_i2c.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c index 8c8fa35f1b7c..2c5567175dca 100644 --- a/drivers/video/aty/radeon_i2c.c +++ b/drivers/video/aty/radeon_i2c.c | |||
@@ -139,12 +139,8 @@ void radeon_delete_i2c_busses(struct radeonfb_info *rinfo) | |||
139 | int radeon_probe_i2c_connector(struct radeonfb_info *rinfo, int conn, | 139 | int radeon_probe_i2c_connector(struct radeonfb_info *rinfo, int conn, |
140 | u8 **out_edid) | 140 | u8 **out_edid) |
141 | { | 141 | { |
142 | u32 reg = rinfo->i2c[conn-1].ddc_reg; | ||
143 | u8 *edid; | 142 | u8 *edid; |
144 | 143 | ||
145 | OUTREG(reg, INREG(reg) & | ||
146 | ~(VGA_DDC_DATA_OUTPUT | VGA_DDC_CLK_OUTPUT)); | ||
147 | |||
148 | edid = fb_ddc_read(&rinfo->i2c[conn-1].adapter); | 144 | edid = fb_ddc_read(&rinfo->i2c[conn-1].adapter); |
149 | 145 | ||
150 | if (out_edid) | 146 | if (out_edid) |