Revert "drm/i915: Don't enable pipe/plane/VCO early (wait for DPMS on)."
[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / intel_display.c
index 2861da3aaf7ebd793c29e78a42a712c8cf18847e..cc8131ff319f3f0d243a15c0ddd924c1a93b8147 100644 (file)
@@ -3653,6 +3653,11 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
                        pipeconf &= ~PIPEACONF_DOUBLE_WIDE;
        }
 
+       dspcntr |= DISPLAY_PLANE_ENABLE;
+       pipeconf |= PIPEACONF_ENABLE;
+       dpll |= DPLL_VCO_ENABLE;
+
+
        /* Disable the panel fitter if it was on our pipe */
        if (!HAS_PCH_SPLIT(dev) && intel_panel_fitter_pipe(dev) == pipe)
                I915_WRITE(PFIT_CONTROL, 0);