From: Maarten Lankhorst Date: Tue, 1 Mar 2016 16:04:01 +0000 (+0100) Subject: drm/i915: Do not return unknown status when load detection is tested. X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=32fff610f7cf05260300f6c18700e9e0ac5910fb;p=openwrt%2Fstaging%2Fblogic.git 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 Signed-off-by: Maarten Lankhorst Link: http://patchwork.freedesktop.org/patch/msgid/1456848241-6431-1-git-send-email-maarten.lankhorst@linux.intel.com Reviewed-by: Ville Syrjälä --- 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);