From: Daniel Vetter Date: Fri, 19 Apr 2013 09:14:36 +0000 (+0200) Subject: drm/i915: remove redundant has_pch_encoder check X-Git-Tag: next-20130521~50^2~99 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9566e9af524856a27f3c6b00821e74ff9ae04732;p=karo-tx-linux.git drm/i915: remove redundant has_pch_encoder check If we compute the pch pll state, we _have_ a pch encoder. Reviewed-by: Ville Syrjälä Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index fa9af52ba5a4..a9013fda1c3a 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5569,8 +5569,7 @@ static uint32_t ironlake_compute_dpll(struct intel_crtc *intel_crtc, } dpll |= DPLL_DVO_HIGH_SPEED; } - if (intel_crtc->config.has_dp_encoder && - intel_crtc->config.has_pch_encoder) + if (intel_crtc->config.has_dp_encoder) dpll |= DPLL_DVO_HIGH_SPEED; /* compute bitmask from p1 value */