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/nvidia/nv_i2c.c | 43 +------------------------------- 2 files changed, 3 insertions(+), 41 deletions(-) diff -puN drivers/video/Kconfig~nvidiafb-use-generic-ddc-reading drivers/video/Kconfig --- a/drivers/video/Kconfig~nvidiafb-use-generic-ddc-reading +++ a/drivers/video/Kconfig @@ -701,6 +701,7 @@ config FB_NVIDIA depends on FB && PCI select I2C_ALGOBIT if FB_NVIDIA_I2C select I2C if FB_NVIDIA_I2C + select FB_DDC if FB_NVIDIA_I2C select FB_MODE_HELPERS select FB_CFB_FILLRECT select FB_CFB_COPYAREA diff -puN drivers/video/nvidia/nv_i2c.c~nvidiafb-use-generic-ddc-reading drivers/video/nvidia/nv_i2c.c --- a/drivers/video/nvidia/nv_i2c.c~nvidiafb-use-generic-ddc-reading +++ a/drivers/video/nvidia/nv_i2c.c @@ -160,51 +160,12 @@ void nvidia_delete_i2c_busses(struct nvi } -static u8 *nvidia_do_probe_i2c_edid(struct nvidia_i2c_chan *chan) -{ - u8 start = 0x0; - struct i2c_msg msgs[] = { - { - .addr = 0x50, - .len = 1, - .buf = &start, - }, { - .addr = 0x50, - .flags = I2C_M_RD, - .len = EDID_LENGTH, - }, - }; - u8 *buf; - - if (!chan->par) - return NULL; - - buf = kmalloc(EDID_LENGTH, GFP_KERNEL); - if (!buf) { - dev_warn(&chan->par->pci_dev->dev, "Out of memory!\n"); - return NULL; - } - msgs[1].buf = buf; - - if (i2c_transfer(&chan->adapter, msgs, 2) == 2) - return buf; - dev_dbg(&chan->par->pci_dev->dev, "Unable to read EDID block.\n"); - kfree(buf); - return NULL; -} - int nvidia_probe_i2c_connector(struct fb_info *info, int conn, u8 **out_edid) { struct nvidia_par *par = info->par; - u8 *edid = NULL; - int i; + u8 *edid; - for (i = 0; i < 3; i++) { - /* Do the real work */ - edid = nvidia_do_probe_i2c_edid(&par->chan[conn - 1]); - if (edid) - break; - } + edid = fb_ddc_read(&par->chan[conn - 1].adapter); if (!edid && conn == 1) { /* try to get from firmware */ _