diff options
| author |   Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-03-01 17:04:01 +0100 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-03-02 10:43:07 +0100 |
| commit | 32fff610f7cf05260300f6c18700e9e0ac5910fb (patch) | |
| tree | 5ab6c9771095db5940e5ac5c5a28cd4fc21011ee /drivers/gpu/drm/i915/intel_crt.c | |
| parent | drm/i915/gen9: Remove state asserts when disabling DC states (diff) | |
| download | linux-dev-32fff610f7cf05260300f6c18700e9e0ac5910fb.tar.xz linux-dev-32fff610f7cf05260300f6c18700e9e0ac5910fb.zip | |
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: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1456848241-6431-1-git-send-email-maarten.lankhorst@linux.intel.com
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_crt.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_crt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 583cae744a1a..5f12a195d55c 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -656,6 +656,8 @@ intel_crt_detect(struct drm_connector *connector, bool force) else if (INTEL_INFO(dev)->gen < 4) status = intel_crt_load_detect(crt, to_intel_crtc(connector->state->crtc)->pipe); + else if (i915.load_detect_test) + status = connector_status_disconnected; else status = connector_status_unknown; intel_release_load_detect_pipe(connector, &tmp, &ctx); |