diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-01-14 15:47:03 +0100 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-01-15 09:28:59 +1000 |
| commit | 0ed3165e55fdedee6fc04b757907a2d5ccacdf18 (patch) | |
| tree | a4a3b95c12cc49efb32e324fb5e2f8071456876a /drivers/gpu/drm/nouveau | |
| parent | c8ebe275790f2c5efc3ffec515c93b7a139829d3 (diff) | |
| download | op-kernel-dev-0ed3165e55fdedee6fc04b757907a2d5ccacdf18.zip op-kernel-dev-0ed3165e55fdedee6fc04b757907a2d5ccacdf18.tar.gz | |
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>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_connector.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index 54c8530..3dc7e09 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); |
