From 806ae196bd28509cf10f358ddd42e9bc0c3c9258 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Fri, 7 Oct 2011 14:23:47 -0400
Subject: [PATCH] --- yaml --- r: 269731 b: refs/heads/master c:
 5f0a26128d66ef81613fe923d5c288942844ccdc h: refs/heads/master i:   269729:
 5270bfe2138687a3a0cbb613b9726414ebddbde0   269727:
 85f4f5835f30a148176202bd75a190866d751506 v: v3

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

diff --git a/[refs] b/[refs]
index f40662cd73d7..4d37ec8d1d02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 286e0c94f9c3f292cb38a977fbbde3433347a868
+refs/heads/master: 5f0a26128d66ef81613fe923d5c288942844ccdc
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_connectors.c b/trunk/drivers/gpu/drm/radeon/radeon_connectors.c
index c4b8741dbf58..fbcf21dd2c23 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -959,6 +959,11 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
 	if ((ret == connector_status_connected) && (radeon_connector->use_digital == true))
 		goto out;
 
+	/* DVI-D and HDMI-A are digital only */
+	if ((connector->connector_type == DRM_MODE_CONNECTOR_DVID) ||
+	    (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA))
+		goto out;
+
 	if (!force) {
 		ret = connector->status;
 		goto out;