Commit 0ed3165e authored by Francisco Jerez's avatar Francisco Jerez Committed by Ben Skeggs
Browse files

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

Signed-off-by: default avatarFrancisco Jerez <>
Signed-off-by: default avatarBen Skeggs <>
parent c8ebe275
......@@ -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",
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;
nv_encoder = find_encoder_by_type(connector, OUTPUT_ANALOG);
if (!nv_encoder)
nv_encoder = find_encoder_by_type(connector, OUTPUT_TV);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment