From: Daniel Vetter Date: Thu, 11 Apr 2013 14:29:07 +0000 (+0200) Subject: drm/i915: don't enable the plane too early in i9xx_crtc_mode_set X-Git-Tag: next-20130422~68^2~24 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d59f9f4d68ca82985a3b4578caa0485a9cb2b71b;p=karo-tx-linux.git drm/i915: don't enable the plane too early in i9xx_crtc_mode_set This is horrible lore and we should be able to get rid of it now that the lvds/pfit handling code actually does the right thing. Reviewed-by: Chris Wilson Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 6e423e04c35e..8b1cfc92849d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4733,8 +4733,6 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc, i9xx_set_pipeconf(intel_crtc); - intel_enable_pipe(dev_priv, pipe, false); - intel_wait_for_vblank(dev, pipe); I915_WRITE(DSPCNTR(plane), dspcntr);