Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ab0460b authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Disable/enable planes as the first/last thing during modeset on gmch platforms 



We already moved the plane disable/enable to happen as the first/last
thing on every other platforms. Follow suit with gmch platforms.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
[danvet: Frob drm_vblank_on conflict, as usual.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d1533379

drivers/gpu/drm/i915/intel_display.c

+6 −6
Original line number Diff line number Diff line
@@ -4539,10 +4539,10 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc) 
	intel_wait_for_vblank(dev_priv->dev, pipe);

	intel_set_cpu_fifo_underrun_reporting(dev, pipe, true);



	intel_crtc_enable_planes(crtc);



	for_each_encoder_on_crtc(dev, crtc, encoder)

		encoder->enable(encoder);



	intel_crtc_enable_planes(crtc);

}



static void i9xx_crtc_enable(struct drm_crtc *crtc)
@@ -4575,10 +4575,10 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc) 
	intel_wait_for_vblank(dev_priv->dev, pipe);

	intel_set_cpu_fifo_underrun_reporting(dev, pipe, true);



	intel_crtc_enable_planes(crtc);



	for_each_encoder_on_crtc(dev, crtc, encoder)

		encoder->enable(encoder);



	intel_crtc_enable_planes(crtc);

}



static void i9xx_pfit_disable(struct intel_crtc *crtc)
@@ -4607,11 +4607,11 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc) 
	if (!intel_crtc->active)

		return;



	intel_crtc_disable_planes(crtc);



	for_each_encoder_on_crtc(dev, crtc, encoder)

		encoder->disable(encoder);



	intel_crtc_disable_planes(crtc);



	intel_set_cpu_fifo_underrun_reporting(dev, pipe, false);

	intel_disable_pipe(dev_priv, pipe);