diff options
-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 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) | |||
252 | if (!nv_connector->edid) { | 252 | if (!nv_connector->edid) { |
253 | NV_ERROR(dev, "DDC responded, but no EDID for %s\n", | 253 | NV_ERROR(dev, "DDC responded, but no EDID for %s\n", |
254 | drm_get_connector_name(connector)); | 254 | drm_get_connector_name(connector)); |
255 | return connector_status_disconnected; | 255 | goto detect_analog; |
256 | } | 256 | } |
257 | 257 | ||
258 | if (nv_encoder->dcb->type == OUTPUT_DP && | 258 | if (nv_encoder->dcb->type == OUTPUT_DP && |
@@ -286,6 +286,7 @@ nouveau_connector_detect(struct drm_connector *connector) | |||
286 | return connector_status_connected; | 286 | return connector_status_connected; |
287 | } | 287 | } |
288 | 288 | ||
289 | detect_analog: | ||
289 | nv_encoder = find_encoder_by_type(connector, OUTPUT_ANALOG); | 290 | nv_encoder = find_encoder_by_type(connector, OUTPUT_ANALOG); |
290 | if (!nv_encoder) | 291 | if (!nv_encoder) |
291 | nv_encoder = find_encoder_by_type(connector, OUTPUT_TV); | 292 | nv_encoder = find_encoder_by_type(connector, OUTPUT_TV); |