From 2b422313548164c4e5164f3852d33f39424d6864 Mon Sep 17 00:00:00 2001
From: "Antonino A. Daplas" <adaplas@gmail.com>
Date: Tue, 3 Oct 2006 01:14:43 -0700
Subject: [PATCH] --- yaml --- r: 38047 b: refs/heads/master c:
 346bc21026e7a92e1d7a4a1b3792c5e8b686133d h: refs/heads/master i:   38045:
 0cee9848cb056338979ca12e62dae4dd9c8c6396   38043:
 e282ba9d3ae3cf32b198abbc8a44e7d967f2f4e8   38039:
 3b558fd715e7b5766e4b37fec32e4d75c73055f8   38031:
 9faa5f8484c507d6d21f5bb895ca4ff8cf49aa1e   38015:
 c46ec45b24450ec5ae0bd339167e670948522a67 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/video/Kconfig         |  1 +
 trunk/drivers/video/nvidia/nv_i2c.c | 45 ++---------------------------
 3 files changed, 5 insertions(+), 43 deletions(-)

diff --git a/[refs] b/[refs]
index 6ce2528e799b..c9873fb2b594 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc5891c8a3ba284f13994d7bc1f1bfa8283982de
+refs/heads/master: 346bc21026e7a92e1d7a4a1b3792c5e8b686133d
diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig
index d498e908f4b7..756ea81e475c 100644
--- a/trunk/drivers/video/Kconfig
+++ b/trunk/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 --git a/trunk/drivers/video/nvidia/nv_i2c.c b/trunk/drivers/video/nvidia/nv_i2c.c
index 19eef3a09023..e48de3c9fd13 100644
--- a/trunk/drivers/video/nvidia/nv_i2c.c
+++ b/trunk/drivers/video/nvidia/nv_i2c.c
@@ -160,51 +160,12 @@ void nvidia_delete_i2c_busses(struct nvidia_par *par)
 
 }
 
-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;
-
-	for (i = 0; i < 3; i++) {
-		/* Do the real work */
-		edid = nvidia_do_probe_i2c_edid(&par->chan[conn - 1]);
-		if (edid)
-			break;
-	}
+	u8 *edid;
+
+	edid = fb_ddc_read(&par->chan[conn - 1].adapter);
 
 	if (!edid && conn == 1) {
 		/* try to get from firmware */