From: "Antonino A. Daplas" Update driver to use generic DDC reading Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton --- drivers/video/Kconfig | 1 drivers/video/savage/savagefb-i2c.c | 44 +------------------------- 2 files changed, 3 insertions(+), 42 deletions(-) diff -puN drivers/video/Kconfig~savagefb-use-generic-ddc-reading drivers/video/Kconfig --- a/drivers/video/Kconfig~savagefb-use-generic-ddc-reading +++ a/drivers/video/Kconfig @@ -1146,6 +1146,7 @@ config FB_SAVAGE depends on FB && PCI && EXPERIMENTAL select I2C_ALGOBIT if FB_SAVAGE_I2C select I2C if FB_SAVAGE_I2C + select FB_DDC if FB_SAVAGE_I2C select FB_MODE_HELPERS select FB_CFB_FILLRECT select FB_CFB_COPYAREA diff -puN drivers/video/savage/savagefb-i2c.c~savagefb-use-generic-ddc-reading drivers/video/savage/savagefb-i2c.c --- a/drivers/video/savage/savagefb-i2c.c~savagefb-use-generic-ddc-reading +++ a/drivers/video/savage/savagefb-i2c.c @@ -214,52 +214,12 @@ void savagefb_delete_i2c_busses(struct f par->chan.par = NULL; } -static u8 *savage_do_probe_i2c_edid(struct savagefb_i2c_chan *chan) -{ - u8 start = 0x0; - struct i2c_msg msgs[] = { - { - .addr = SAVAGE_DDC, - .len = 1, - .buf = &start, - }, { - .addr = SAVAGE_DDC, - .flags = I2C_M_RD, - .len = EDID_LENGTH, - }, - }; - u8 *buf = NULL; - - if (chan->par) { - buf = kmalloc(EDID_LENGTH, GFP_KERNEL); - - if (buf) { - msgs[1].buf = buf; - - if (i2c_transfer(&chan->adapter, msgs, 2) != 2) { - dev_dbg(&chan->par->pcidev->dev, - "Unable to read EDID block.\n"); - kfree(buf); - buf = NULL; - } - } - } - - return buf; -} - int savagefb_probe_i2c_connector(struct fb_info *info, u8 **out_edid) { struct savagefb_par *par = info->par; - u8 *edid = NULL; - int i; + u8 *edid; - for (i = 0; i < 3; i++) { - /* Do the real work */ - edid = savage_do_probe_i2c_edid(&par->chan); - if (edid) - break; - } + edid = fb_ddc_read(&par->chan.adapter); if (!edid) { /* try to get from firmware */ _