diff options
-rw-r--r-- | 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 41674e1a26c7..9f134d2b7bec 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) | |||
2015 | 2015 | ||
2016 | /* Cache some DPCD data in the eDP case */ | 2016 | /* Cache some DPCD data in the eDP case */ |
2017 | if (is_edp(intel_dp)) { | 2017 | if (is_edp(intel_dp)) { |
2018 | int ret; | 2018 | bool ret; |
2019 | u32 pp_on, pp_div; | 2019 | u32 pp_on, pp_div; |
2020 | 2020 | ||
2021 | pp_on = I915_READ(PCH_PP_ON_DELAYS); | 2021 | pp_on = I915_READ(PCH_PP_ON_DELAYS); |
@@ -2028,11 +2028,9 @@ intel_dp_init(struct drm_device *dev, int output_reg) | |||
2028 | dev_priv->panel_t12 *= 100; /* t12 in 100ms units */ | 2028 | dev_priv->panel_t12 *= 100; /* t12 in 100ms units */ |
2029 | 2029 | ||
2030 | ironlake_edp_panel_vdd_on(intel_dp); | 2030 | ironlake_edp_panel_vdd_on(intel_dp); |
2031 | ret = intel_dp_aux_native_read(intel_dp, DP_DPCD_REV, | 2031 | ret = intel_dp_get_dpcd(intel_dp); |
2032 | intel_dp->dpcd, | ||
2033 | sizeof(intel_dp->dpcd)); | ||
2034 | ironlake_edp_panel_vdd_off(intel_dp); | 2032 | ironlake_edp_panel_vdd_off(intel_dp); |
2035 | if (ret == sizeof(intel_dp->dpcd)) { | 2033 | if (ret) { |
2036 | if (intel_dp->dpcd[DP_DPCD_REV] >= 0x11) | 2034 | if (intel_dp->dpcd[DP_DPCD_REV] >= 0x11) |
2037 | dev_priv->no_aux_handshake = | 2035 | dev_priv->no_aux_handshake = |
2038 | intel_dp->dpcd[DP_MAX_DOWNSPREAD] & | 2036 | intel_dp->dpcd[DP_MAX_DOWNSPREAD] & |