radeonfb: revert "Fix radeon DDC regression"
The bug was in fb_ddc and was fixed by commit
b64d70825a
(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>
This commit is contained in:
parent
35e8bb5175
commit
319fcb224d
|
@ -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)
|
||||||
|
|
Loading…
Reference in New Issue