---

yaml --- r: 357919 b: refs/heads/master c: 1b46963 h: refs/heads/master i: 357917: a740535 357915: cd477b9 357911: 989c9ca 357903: 0fc44dd 357887: 39060d6 v: v3
git-mirror · Dec 14, 2012 · 1d779c8 · 1d779c8
1 parent 2cc965d
commit 1d779c8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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);
 }