Commit 32fff610 authored by Maarten Lankhorst's avatar Maarten Lankhorst

drm/i915: Do not return unknown status when load detection is tested.

This fixes the IGT test, which interprets unknown status as failed to
acquire load detect pipe.

Cc: Gabriel Feceoru <gabriel.feceoru@intel.com>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1456848241-6431-1-git-send-email-maarten.lankhorst@linux.intel.comReviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
parent 5b773eb4
...@@ -656,6 +656,8 @@ intel_crt_detect(struct drm_connector *connector, bool force) ...@@ -656,6 +656,8 @@ intel_crt_detect(struct drm_connector *connector, bool force)
else if (INTEL_INFO(dev)->gen < 4) else if (INTEL_INFO(dev)->gen < 4)
status = intel_crt_load_detect(crt, status = intel_crt_load_detect(crt,
to_intel_crtc(connector->state->crtc)->pipe); to_intel_crtc(connector->state->crtc)->pipe);
else if (i915.load_detect_test)
status = connector_status_disconnected;
else else
status = connector_status_unknown; status = connector_status_unknown;
intel_release_load_detect_pipe(connector, &tmp, &ctx); intel_release_load_detect_pipe(connector, &tmp, &ctx);
......
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