aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-04-19 05:14:36 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-04-25 15:21:50 -0400
commit9566e9af524856a27f3c6b00821e74ff9ae04732 (patch)
tree894b2d6c7b4bd9b95660152cc9d27a7c72899ce0 /drivers/gpu/drm/i915
parent4f4134ace04fd5b0e8734b65f4046e7aa2e39393 (diff)
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ä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c3
1 files changed, 1 insertions, 2 deletions
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,
5569 } 5569 }
5570 dpll |= DPLL_DVO_HIGH_SPEED; 5570 dpll |= DPLL_DVO_HIGH_SPEED;
5571 } 5571 }
5572 if (intel_crtc->config.has_dp_encoder && 5572 if (intel_crtc->config.has_dp_encoder)
5573 intel_crtc->config.has_pch_encoder)
5574 dpll |= DPLL_DVO_HIGH_SPEED; 5573 dpll |= DPLL_DVO_HIGH_SPEED;
5575 5574
5576 /* compute bitmask from p1 value */ 5575 /* compute bitmask from p1 value */