drm/i915: Don't enable pipe/plane/VCO early (wait for DPMS on).
authorCarl Worth <cworth@cworth.org>
Fri, 9 Apr 2010 06:31:57 +0000 (23:31 -0700)
committerEric Anholt <eric@anholt.net>
Mon, 12 Apr 2010 16:24:01 +0000 (09:24 -0700)
The existing code handling the DPMS ON event is much more careful to
ensure that these registers are enabled according to strict sequencing
requirements. Enabling these early in mode_set simply defeats that.

Signed-off-by: Carl Worth <cworth@cworth.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
drivers/gpu/drm/i915/intel_display.c

index 3ee68bcce7b0ec61b1500f983e7876520e9e20d9..243dfb80cd92b0564fc2e922f49fc74e218ded2d 100644 (file)
@@ -3463,11 +3463,6 @@ 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);