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

Commit 4fe9467d authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

drm/i915: ddi: move pch setup after encoder->pre_enable 



This is needed by an upcoming patch that moves the PCH/CRT PLL enabling
into the pre_enable 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 pre_enable 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 114fe488

drivers/gpu/drm/i915/intel_display.c

+5 −6
Original line number Diff line number Diff line
@@ -4100,16 +4100,15 @@ static void haswell_crtc_enable(struct drm_crtc *crtc) 
	intel_crtc->active = true;



	intel_set_cpu_fifo_underrun_reporting(dev, pipe, true);

	if (intel_crtc->config.has_pch_encoder)

		intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_A, true);



	if (intel_crtc->config.has_pch_encoder)

		dev_priv->display.fdi_link_train(crtc);



	for_each_encoder_on_crtc(dev, crtc, encoder)

		if (encoder->pre_enable)

			encoder->pre_enable(encoder);



	if (intel_crtc->config.has_pch_encoder) {

		intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_A, true);

		dev_priv->display.fdi_link_train(crtc);

	}



	intel_ddi_enable_pipe_clock(intel_crtc);



	ironlake_pfit_enable(intel_crtc);