drm/i915: fix up pch pll enabling for pixel multipliers

[linux-imx.git] / drivers / gpu / drm / i915 / intel_display.c

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 5b2fd9063a2d1cc5711f0759f3dd6bd38b251ac1..015614fb04d91236d3c177aec786b968e4e66aa3 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5660,7 +5660,7 @@ static uint32_t ironlake_compute_dpll(struct intel_crtc *intel_crtc,
        else
                dpll |= PLL_REF_INPUT_DREFCLK;
 
-       return dpll;
+       return dpll | DPLL_VCO_ENABLE;
 }
 
 static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
@@ -5722,7 +5722,7 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
                                             &fp, &reduced_clock,
                                             has_reduced_clock ? &fp2 : NULL);
 
-               intel_crtc->config.dpll_hw_state.dpll = dpll | DPLL_VCO_ENABLE;
+               intel_crtc->config.dpll_hw_state.dpll = dpll;
                intel_crtc->config.dpll_hw_state.fp0 = fp;
                if (has_reduced_clock)
                        intel_crtc->config.dpll_hw_state.fp1 = fp2;