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

Commit 952735ee authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: move encoder pre enable hooks togther on ilk+ 



The ->pre_enable hook is only used for the cpu edp port on ilk-ivb, so
we can safely move it up across the fdi pll enabling.

Unfortunately we can't (yet) merge in the pre_pll enable hook despite
that only lvds uses it on ilk-ivb: Since the same lvds hook is also
need on i9xx platforms we need to fix up the pll enabling sequence
there, too.

Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 55607e8a

drivers/gpu/drm/i915/intel_display.c

+4 −5
Original line number Diff line number Diff line
@@ -3198,9 +3198,12 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) 


	intel_update_watermarks(dev);



	for_each_encoder_on_crtc(dev, crtc, encoder)

	for_each_encoder_on_crtc(dev, crtc, encoder) {

		if (encoder->pre_pll_enable)

			encoder->pre_pll_enable(encoder);

		if (encoder->pre_enable)

			encoder->pre_enable(encoder);

	}



	if (intel_crtc->config.has_pch_encoder) {

		/* Note: FDI PLL enabling _must_ be done before we enable the
@@ -3212,10 +3215,6 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) 
		assert_fdi_rx_disabled(dev_priv, pipe);

	}



	for_each_encoder_on_crtc(dev, crtc, encoder)

		if (encoder->pre_enable)

			encoder->pre_enable(encoder);



	ironlake_pfit_enable(intel_crtc);



	/*