mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
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>
This commit is contained in:
parent
c8ebe27579
commit
0ed3165e55
1 changed files with 2 additions and 1 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue