From d8262b21826d5c3f06b4ea5564efa40b02438585 Mon Sep 17 00:00:00 2001
From: Thomas Reim <reimth@gmail.com>
Date: Fri, 29 Jul 2011 14:29:00 +0000
Subject: [PATCH] --- yaml --- r: 262567 b: refs/heads/master c:
 a81b31e9fc98e067b7e7f1244861c97e44268e2d h: refs/heads/master i:   262565:
 70bb9da697c251bfc7d83f3e405429086daa6d67   262563:
 9faf378fd86a7b0cd8e997ce30a76710eda6f7ab   262559:
 034c4a8fde881f58cda159641519a0bde2dfabbd v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/gpu/drm/radeon/radeon_connectors.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d95e6ba16b64..fa039df324b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d522d9cc5bdd41214084383fc3e6d882f6916a78
+refs/heads/master: a81b31e9fc98e067b7e7f1244861c97e44268e2d
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_connectors.c b/trunk/drivers/gpu/drm/radeon/radeon_connectors.c
index 6a0f1befbc15..6d6b5f16bc09 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -455,6 +455,15 @@ static bool radeon_connector_needs_extended_probe(struct radeon_device *dev,
 		    (supported_device == ATOM_DEVICE_DFP2_SUPPORT))
 			return true;
 	}
+	/* ECS A740GM-M with ATI RADEON 2100 sends data to i2c bus
+	 * for a DVI connector that is not implemented */
+	if ((dev->pdev->device == 0x796e) &&
+	    (dev->pdev->subsystem_vendor == 0x1019) &&
+	    (dev->pdev->subsystem_device == 0x2615)) {
+		if ((connector_type == DRM_MODE_CONNECTOR_DVID) &&
+		    (supported_device == ATOM_DEVICE_DFP2_SUPPORT))
+			return true;
+	}
 
 	/* Default: no EDID header probe required for DDC probing */
 	return false;