Skip to content

Commit

Permalink
drm/i915: In intel_dp_init, replace read of DPCD with intel_dp_get_dpcd
Browse files Browse the repository at this point in the history
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 <keithp@keithp.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
  • Loading branch information
Keith Packard committed Jul 28, 2011
1 parent 26d61aa commit 59f3e27
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/gpu/drm/i915/intel_dp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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] &
Expand Down

0 comments on commit 59f3e27

Please sign in to comment.