| From e00ba0d23f5dd0bd4535c4e72c75391346bb9a55 Mon Sep 17 00:00:00 2001 |
| From: Daniel Vetter <daniel.vetter@ffwll.ch> |
| Date: Thu, 11 Apr 2013 16:29:07 +0200 |
| Subject: 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 <chris@chris-wilson.co.uk> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit d59f9f4d68ca82985a3b4578caa0485a9cb2b71b) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_display.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c |
| index c714d4d5bedb..4edf527f1899 100644 |
| --- a/drivers/gpu/drm/i915/intel_display.c |
| +++ b/drivers/gpu/drm/i915/intel_display.c |
| @@ -4745,8 +4745,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); |
| -- |
| 1.8.5.rc3 |
| |
