From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [Intel-gfx] [PATCH 3/5] drm/i915: In intel_dp_init, replace read of DPCD with intel_dp_get_dpcd Date: Tue, 26 Jul 2011 09:38:46 -0700 Message-ID: <20110726093846.58e2c9f1@jbarnes-desktop> References: <1311662194-4050-1-git-send-email-keithp@keithp.com> <1311662194-4050-4-git-send-email-keithp@keithp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from oproxy6-pub.bluehost.com (oproxy6-pub.bluehost.com [67.222.54.6]) by gabe.freedesktop.org (Postfix) with SMTP id 475629F4FA for ; Tue, 26 Jul 2011 09:38:54 -0700 (PDT) In-Reply-To: <1311662194-4050-4-git-send-email-keithp@keithp.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Keith Packard Cc: Dave Airlie , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Mon, 25 Jul 2011 23:36:32 -0700 Keith Packard wrote: > Eliminates an open-coded read and also gains the retry behaviour of > intel_dp_get_dpcd, which seems like a good idea. > > Signed-off-by: Keith Packard > --- > drivers/gpu/drm/i915/intel_dp.c | 8 +++----- > 1 files changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 41674e1..9f134d2 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -2015,7 +2015,7 @@ intel_dp_init(struct drm_device *dev, int output_reg) > > /* Cache some DPCD data in the eDP case */ > if (is_edp(intel_dp)) { > - int ret; > + bool ret; > u32 pp_on, pp_div; > > pp_on = I915_READ(PCH_PP_ON_DELAYS); > @@ -2028,11 +2028,9 @@ intel_dp_init(struct drm_device *dev, int output_reg) > dev_priv->panel_t12 *= 100; /* t12 in 100ms units */ > > ironlake_edp_panel_vdd_on(intel_dp); > - ret = intel_dp_aux_native_read(intel_dp, DP_DPCD_REV, > - intel_dp->dpcd, > - sizeof(intel_dp->dpcd)); > + ret = intel_dp_get_dpcd(intel_dp); > ironlake_edp_panel_vdd_off(intel_dp); > - if (ret == sizeof(intel_dp->dpcd)) { > + if (ret) { > if (intel_dp->dpcd[DP_DPCD_REV] >= 0x11) > dev_priv->no_aux_handshake = > intel_dp->dpcd[DP_MAX_DOWNSPREAD] & Reviewed-by: Jesse Barnes Now we just have to enable fast link training in the eDP case (and optionally when we know the DP monitor hasn't changed, just DPMS'd). -- Jesse Barnes, Intel Open Source Technology Center