From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH 3/4] drm/i915/dp: Read the HPD status before trying to read the DPCD Date: Thu, 13 Dec 2012 13:16:27 +0200 Message-ID: <87zk1i2odw.fsf@intel.com> References: <1355341841-4595-1-git-send-email-damien.lespiau@gmail.com> <1355341841-4595-3-git-send-email-damien.lespiau@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 86501E67E7 for ; Thu, 13 Dec 2012 03:15:26 -0800 (PST) In-Reply-To: <1355341841-4595-3-git-send-email-damien.lespiau@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Damien Lespiau , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Wed, 12 Dec 2012, Damien Lespiau wrote: > From: Damien Lespiau > > Just like: > > commit a93cd34234db2269fa2481464ffd39263d617aed This is your local commit id, and will be meaningless upstream. Otherwise, Reviewed-by: Jani Nikula > Author: Damien Lespiau > 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 > --- > 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 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx