Commit 319fcb22 authored by Jean Delvare's avatar Jean Delvare Committed by Linus Torvalds

radeonfb: revert "Fix radeon DDC regression"

The bug was in fb_ddc and was fixed by commit
b64d7082 (fb_ddc: fix DDC lines quirk) so
the workaround in radeonfb can be removed now.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 35e8bb51
...@@ -139,12 +139,8 @@ void radeon_delete_i2c_busses(struct radeonfb_info *rinfo) ...@@ -139,12 +139,8 @@ void radeon_delete_i2c_busses(struct radeonfb_info *rinfo)
int radeon_probe_i2c_connector(struct radeonfb_info *rinfo, int conn, int radeon_probe_i2c_connector(struct radeonfb_info *rinfo, int conn,
u8 **out_edid) u8 **out_edid)
{ {
u32 reg = rinfo->i2c[conn-1].ddc_reg;
u8 *edid; u8 *edid;
OUTREG(reg, INREG(reg) &
~(VGA_DDC_DATA_OUTPUT | VGA_DDC_CLK_OUTPUT));
edid = fb_ddc_read(&rinfo->i2c[conn-1].adapter); edid = fb_ddc_read(&rinfo->i2c[conn-1].adapter);
if (out_edid) if (out_edid)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment