From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 3/6] drm/i915/dp: Read the HPD status before trying to read the DPCD Date: Fri, 14 Dec 2012 11:17:04 +0100 Message-ID: <20121214101703.GF5737@phenom.ffwll.local> References: <1355414944-1494-1-git-send-email-damien.lespiau@gmail.com> <1355414944-1494-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 mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by gabe.freedesktop.org (Postfix) with ESMTP id A5D80E5EB1 for ; Fri, 14 Dec 2012 02:15:32 -0800 (PST) Received: by mail-wg0-f45.google.com with SMTP id dq12so1268180wgb.12 for ; Fri, 14 Dec 2012 02:15:31 -0800 (PST) Content-Disposition: inline In-Reply-To: <1355414944-1494-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 Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Thu, Dec 13, 2012 at 04:09:01PM +0000, Damien Lespiau wrote: > From: Damien Lespiau > > Just like: > > 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. > > v2: Adapt to the ibx_ name change and don't add commit hash (Chris > Wilson, Jani Nikula) > > Reviewed-by: Jani Nikula > 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..19a0d89 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 (!ibx_digital_port_connected(dev_priv, intel_dig_port)) > + return connector_status_disconnected; Can I volunteer you to do the same nice unification with g4x_digital_port_connected? Despite the different names between hdmi and dp, they're the same bits. I have a g4x here, so can test whether it breaks. -Daniel > + > 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 -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch