From 6fca3eb49f1bf5244a6730c209c66a791e2e4648 Mon Sep 17 00:00:00 2001 From: Imre Deak Date: Thu, 5 Sep 2013 14:54:04 +0300 Subject: [PATCH 1/2] drm/i915: ilk: fix modeset disable sequence Signed-off-by: Imre Deak --- drivers/gpu/drm/i915/intel_display.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index d88057e..8c829c1 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3454,9 +3454,6 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc) if (!intel_crtc->active) return; - for_each_encoder_on_crtc(dev, crtc, encoder) - encoder->disable(encoder); - intel_crtc_wait_for_pending_flips(crtc); drm_vblank_off(dev, pipe); @@ -3470,6 +3467,9 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc) if (intel_crtc->config.has_pch_encoder) intel_set_pch_fifo_underrun_reporting(dev, pipe, false); + for_each_encoder_on_crtc(dev, crtc, encoder) + encoder->disable(encoder); + intel_disable_pipe(dev_priv, pipe); ironlake_pfit_disable(intel_crtc); -- 1.8.3.2