| From 2997db2589af9a5081fa13a94fea9c69dd66e549 Mon Sep 17 00:00:00 2001 |
| From: Daniel Vetter <daniel.vetter@ffwll.ch> |
| Date: Fri, 19 Apr 2013 11:14:36 +0200 |
| Subject: drm/i915: remove redundant has_pch_encoder check |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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> |
| (cherry picked from commit 9566e9af524856a27f3c6b00821e74ff9ae04732) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_display.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c |
| index a22bcf576ea9..2a951781074d 100644 |
| --- a/drivers/gpu/drm/i915/intel_display.c |
| +++ b/drivers/gpu/drm/i915/intel_display.c |
| @@ -5581,8 +5581,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 */ |
| -- |
| 1.8.5.rc3 |
| |
