From: Francisco Jerez <currojerez@riseup.net>
Date: Thu, 14 Jan 2010 14:47:03 +0000 (+0100)
Subject: drm/nouveau: Fallback to analog load detection when the EDID block is invalid.
X-Git-Tag: firefly_0821_release~9833^2~2198^2~84^2~76
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0ed3165e55fdedee6fc04b757907a2d5ccacdf18;p=firefly-linux-kernel-4.4.55.git

drm/nouveau: Fallback to analog load detection when the EDID block is invalid.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 54c85305a0fb..3dc7e09da286 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -252,7 +252,7 @@ nouveau_connector_detect(struct drm_connector *connector)
 		if (!nv_connector->edid) {
 			NV_ERROR(dev, "DDC responded, but no EDID for %s\n",
 				 drm_get_connector_name(connector));
-			return connector_status_disconnected;
+			goto detect_analog;
 		}
 
 		if (nv_encoder->dcb->type == OUTPUT_DP &&
@@ -286,6 +286,7 @@ nouveau_connector_detect(struct drm_connector *connector)
 		return connector_status_connected;
 	}
 
+detect_analog:
 	nv_encoder = find_encoder_by_type(connector, OUTPUT_ANALOG);
 	if (!nv_encoder)
 		nv_encoder = find_encoder_by_type(connector, OUTPUT_TV);