[Intel-gfx] [PATCH 3/4] drm/i915/dp: Read the HPD status before trying to read the DPCD

Damien Lespiau damien.lespiau at gmail.com
Wed Dec 12 20:50:40 CET 2012


From: Damien Lespiau <damien.lespiau at intel.com>

Just like:

 commit a93cd34234db2269fa2481464ffd39263d617aed
 Author: Damien Lespiau <damien.lespiau at intel.com>
 Date:   Wed Dec 12 19:37:22 2012 +0000

     drm/i915/hdmi: Read the HPD status before trying to read the EDID

But this time for DiplayPort.

Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>
---
 drivers/gpu/drm/i915/intel_dp.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index b2130bc..fe3c22f 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/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 (!intel_ironlake_digital_port_connected(dev_priv, intel_dig_port))
+		return connector_status_disconnected;
+
 	return intel_dp_detect_dpcd(intel_dp);
 }
 
-- 
1.7.11.7




More information about the Intel-gfx mailing list