lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Francisco Jerez
2010-01-14 15:47:03 +01:00
committed by Ben Skeggs
parent c8ebe27579
commit 0ed3165e55
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/nouveau/nouveau_connector.c
View File

@@ -252,7 +252,7 @@ nouveau_connector_detect(struct drm_connector *connector)
if (!nv_connector->edid) { if (!nv_connector->edid) {
NV_ERROR(dev, "DDC responded, but no EDID for %s\n", NV_ERROR(dev, "DDC responded, but no EDID for %s\n",
drm_get_connector_name(connector)); drm_get_connector_name(connector));
return connector_status_disconnected; goto detect_analog;
} }
if (nv_encoder->dcb->type == OUTPUT_DP && if (nv_encoder->dcb->type == OUTPUT_DP &&
@@ -286,6 +286,7 @@ nouveau_connector_detect(struct drm_connector *connector)
return connector_status_connected; return connector_status_connected;
} }
detect_analog:
nv_encoder = find_encoder_by_type(connector, OUTPUT_ANALOG); nv_encoder = find_encoder_by_type(connector, OUTPUT_ANALOG);
if (!nv_encoder) if (!nv_encoder)
nv_encoder = find_encoder_by_type(connector, OUTPUT_TV); nv_encoder = find_encoder_by_type(connector, OUTPUT_TV);