summaryrefslogtreecommitdiffstats
path: root/drivers/video/aty
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2008-10-16 07:03:17 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 20:21:41 +0200
commit319fcb224d66a4702731ec13b8ac670ad1e923bf (patch)
treecee39a4c00be0f1468bda6965448caf9aec27313 /drivers/video/aty
parentgpiolib: request/free hooks (diff)
downloadlinux-319fcb224d66a4702731ec13b8ac670ad1e923bf.tar.xz
linux-319fcb224d66a4702731ec13b8ac670ad1e923bf.zip
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')
-rw-r--r--drivers/video/aty/radeon_i2c.c4
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)
int radeon_probe_i2c_connector(struct radeonfb_info *rinfo, int conn,
u8 **out_edid)
{
- u32 reg = rinfo->i2c[conn-1].ddc_reg;
u8 *edid;
- OUTREG(reg, INREG(reg) &
- ~(VGA_DDC_DATA_OUTPUT | VGA_DDC_CLK_OUTPUT));
-
edid = fb_ddc_read(&rinfo->i2c[conn-1].adapter);
if (out_edid)