[PATCH] radeonfb: Use generic DDC reading

Uses the generic ddc read functionality in fbmon.c instead of the previous
functionality.

Signed-off-by: Dennis Munsie <dmunsie@cecropia.com>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 4 insertions, 103 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 0e371e060871..a1c8923b0bf5 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1020,6 +1020,7 @@ config FB_RADEON
         depends on FB && PCI
         select I2C_ALGOBIT if FB_RADEON_I2C
         select I2C if FB_RADEON_I2C
+        select FB_DDC if FB_RADEON_I2C
         select FB_MODE_HELPERS
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c
index 9aaca58c074a..676754520099 100644
--- a/drivers/video/aty/radeon_i2c.c
+++ b/drivers/video/aty/radeon_i2c.c
@@ -16,8 +16,6 @@
 #include "radeonfb.h"
 #include "../edid.h"
 
-#define RADEON_DDC      0x50
-
 static void radeon_gpio_setscl(void* data, int state)
 {
         struct radeon_i2c_chan  *chan = data;
@@ -138,108 +136,10 @@ void radeon_delete_i2c_busses(struct radeonfb_info *rinfo)
         rinfo->i2c[3].rinfo = NULL;
 }
 
-
-static u8 *radeon_do_probe_i2c_edid(struct radeon_i2c_chan *chan)
-{
-        u8 start = 0x0;
-        struct i2c_msg msgs[] = {
-                {
-                        .addr   = RADEON_DDC,
-                        .len    = 1,
-                        .buf    = &start,
-                }, {
-                        .addr   = RADEON_DDC,
-                        .flags  = I2C_M_RD,
-                        .len    = EDID_LENGTH,
-                },
-        };
-        u8 *buf;
-
-        buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
-        if (!buf) {
-                dev_warn(&chan->rinfo->pdev->dev, "Out of memory!\n");
-                return NULL;
-        }
-        msgs[1].buf = buf;
-
-        if (i2c_transfer(&chan->adapter, msgs, 2) == 2)
-                return buf;
-        dev_dbg(&chan->rinfo->pdev->dev, "Unable to read EDID block.\n");
-        kfree(buf);
-        return NULL;
-}
-
-
-int radeon_probe_i2c_connector(struct radeonfb_info *rinfo, int conn, u8 **out_edid)
+int radeon_probe_i2c_connector(struct radeonfb_info *rinfo, int conn,
+                               u8 **out_edid)
 {
-        u32 reg = rinfo->i2c[conn-1].ddc_reg;
-        u8 *edid = NULL;
-        int i, j;
-
-        OUTREG(reg, INREG(reg) & 
-                        ~(VGA_DDC_DATA_OUTPUT | VGA_DDC_CLK_OUTPUT));
-
-        OUTREG(reg, INREG(reg) & ~(VGA_DDC_CLK_OUT_EN));
-        (void)INREG(reg);
-
-        for (i = 0; i < 3; i++) {
-                /* For some old monitors we need the
-                 * following process to initialize/stop DDC
-                 */
-                OUTREG(reg, INREG(reg) & ~(VGA_DDC_DATA_OUT_EN));
-                (void)INREG(reg);
-                msleep(13);
-
-                OUTREG(reg, INREG(reg) & ~(VGA_DDC_CLK_OUT_EN));
-                (void)INREG(reg);
-                for (j = 0; j < 5; j++) {
-                        msleep(10);
-                        if (INREG(reg) & VGA_DDC_CLK_INPUT)
-                                break;
-                }
-                if (j == 5)
-                        continue;
-
-                OUTREG(reg, INREG(reg) | VGA_DDC_DATA_OUT_EN);
-                (void)INREG(reg);
-                msleep(15);
-                OUTREG(reg, INREG(reg) | VGA_DDC_CLK_OUT_EN);
-                (void)INREG(reg);
-                msleep(15);
-                OUTREG(reg, INREG(reg) & ~(VGA_DDC_DATA_OUT_EN));
-                (void)INREG(reg);
-                msleep(15);
-
-                /* Do the real work */
-                edid = radeon_do_probe_i2c_edid(&rinfo->i2c[conn-1]);
-
-                OUTREG(reg, INREG(reg) | 
-                                (VGA_DDC_DATA_OUT_EN | VGA_DDC_CLK_OUT_EN));
-                (void)INREG(reg);
-                msleep(15);
-                
-                OUTREG(reg, INREG(reg) & ~(VGA_DDC_CLK_OUT_EN));
-                (void)INREG(reg);
-                for (j = 0; j < 10; j++) {
-                        msleep(10);
-                        if (INREG(reg) & VGA_DDC_CLK_INPUT)
-                                break;
-                }
-
-                OUTREG(reg, INREG(reg) & ~(VGA_DDC_DATA_OUT_EN));
-                (void)INREG(reg);
-                msleep(15);
-                OUTREG(reg, INREG(reg) |
-                                (VGA_DDC_DATA_OUT_EN | VGA_DDC_CLK_OUT_EN));
-                (void)INREG(reg);
-                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);
+        u8 *edid = fb_ddc_read(&rinfo->i2c[conn-1].adapter);
 
         if (out_edid)
                 *out_edid = edid;