From: Carl Worth Date: Fri, 9 Apr 2010 06:31:57 +0000 (-0700) Subject: drm/i915: Don't enable pipe/plane/VCO early (wait for DPMS on). X-Git-Tag: v2.6.35-rc1~451^2~91^2~14 X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=cfecde435dda78248d6fcdc424bed68d5db6be0b;hp=ea059a1ec4496a10f94ca9d0c1b530faf1b85dce;p=net-next-2.6.git drm/i915: Don't enable pipe/plane/VCO early (wait for DPMS on). 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 Signed-off-by: Eric Anholt --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3ee68bcce7b..243dfb80cd9 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -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);