drm/i915: remove redundant has_pch_encoder check
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 19 Apr 2013 09:14:36 +0000 (11:14 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 25 Apr 2013 19:21:50 +0000 (21:21 +0200)
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>
drivers/gpu/drm/i915/intel_display.c

index fa9af52..a9013fd 100644 (file)
@@ -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 */