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

Commit 97b040aa authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

drm/i915: ddi: move pch cleanup before encoder->post_disable 



This is needed by an upcoming patch that moves the PCH/CRT PLL disabling
into the post_disable hook, after which we want to keep the modeset
sequence at its current state. At this point this won't have an effect
since the PCH/CRT post_disable hook is atm a NOP.

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4fe9467d

drivers/gpu/drm/i915/intel_display.c

+4 −4
Original line number Diff line number Diff line
@@ -4246,16 +4246,16 @@ static void haswell_crtc_disable(struct drm_crtc *crtc) 


	intel_ddi_disable_pipe_clock(intel_crtc);



	for_each_encoder_on_crtc(dev, crtc, encoder)

		if (encoder->post_disable)

			encoder->post_disable(encoder);



	if (intel_crtc->config.has_pch_encoder) {

		lpt_disable_pch_transcoder(dev_priv);

		intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_A, true);

		intel_ddi_fdi_disable(crtc);

	}



	for_each_encoder_on_crtc(dev, crtc, encoder)

		if (encoder->post_disable)

			encoder->post_disable(encoder);



	intel_crtc->active = false;

	intel_update_watermarks(crtc);