Skip to content

Commit

Permalink
drm/i915/dp: Read the HPD status before trying to read the DPCD
Browse files Browse the repository at this point in the history
Just like:

  Author: Damien Lespiau <damien.lespiau@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.

v2: Adapt to the ibx_ name change and don't add commit hash (Chris
Wilson, Jani Nikula)

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Damien Lespiau authored and Daniel Vetter committed Dec 14, 2012
1 parent b0ea7d3 commit 1b46963
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions drivers/gpu/drm/i915/intel_dp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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... */
Expand All @@ -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);
}

Expand Down

0 comments on commit 1b46963

Please sign in to comment.