diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-04-19 11:14:36 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-04-25 21:21:50 +0200 |
| commit | 9566e9af524856a27f3c6b00821e74ff9ae04732 (patch) | |
| tree | 894b2d6c7b4bd9b95660152cc9d27a7c72899ce0 | |
| parent | 4f4134ace04fd5b0e8734b65f4046e7aa2e39393 (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>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 3 |
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 fa9af52ba5a..a9013fda1c3 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 */ |