From 1d779c8ae6ea01c09968344dc522d01fba089dc4 Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Thu, 13 Dec 2012 16:09:01 +0000 Subject: [PATCH] --- yaml --- r: 357919 b: refs/heads/master c: 1b4696394aeb8a550f8537e92ae6cc65f444dca0 h: refs/heads/master i: 357917: a740535092e5874721631ad374821d9a324b34b3 357915: cd477b950d8c2df1ae0a0f5d80b55e48afab3852 357911: 989c9ca52b2b1479f344eb3b013dd0812ed04f3b 357903: 0fc44dd8b2e1303294e46c2a7aa239103ca60492 357887: 39060d6c853344568e172c506ef3657dd28626e4 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_dp.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b9c76d336a89..9f2db6842e41 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0ea7d37a8f63eeec5ae80b4a6403cfba01da02f +refs/heads/master: 1b4696394aeb8a550f8537e92ae6cc65f444dca0 diff --git a/trunk/drivers/gpu/drm/i915/intel_dp.c b/trunk/drivers/gpu/drm/i915/intel_dp.c index b2130bc6c297..19a0d8984079 100644 --- a/trunk/drivers/gpu/drm/i915/intel_dp.c +++ b/trunk/drivers/gpu/drm/i915/intel_dp.c @@ -2248,6 +2248,8 @@ static enum drm_connector_status ironlake_dp_detect(struct intel_dp *intel_dp) { struct drm_device *dev = intel_dp_to_dev(intel_dp); + struct drm_i915_private *dev_priv = dev->dev_private; + struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); enum drm_connector_status status; /* Can't disconnect eDP, but you can close the lid... */ @@ -2258,6 +2260,9 @@ ironlake_dp_detect(struct intel_dp *intel_dp) return status; } + if (!ibx_digital_port_connected(dev_priv, intel_dig_port)) + return connector_status_disconnected; + return intel_dp_detect_dpcd(intel_dp); }