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

Commit f6736a1a authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: s/pre_pll/pre/ on the lvds port enable function 



i9xx doesn't use pre_enable at all, so we can fold this in now.

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

drivers/gpu/drm/i915/intel_display.c

+3 −10
Original line number Diff line number Diff line
@@ -3214,12 +3214,9 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) 


	intel_update_watermarks(dev);



	for_each_encoder_on_crtc(dev, crtc, encoder) {

		if (encoder->pre_pll_enable)

			encoder->pre_pll_enable(encoder);

	for_each_encoder_on_crtc(dev, crtc, 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
@@ -3662,16 +3659,12 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc) 
	intel_crtc->active = true;

	intel_update_watermarks(dev);



	for_each_encoder_on_crtc(dev, crtc, encoder)

		if (encoder->pre_pll_enable)

			encoder->pre_pll_enable(encoder);



	i9xx_enable_pll(intel_crtc);



	for_each_encoder_on_crtc(dev, crtc, encoder)

		if (encoder->pre_enable)

			encoder->pre_enable(encoder);



	i9xx_enable_pll(intel_crtc);



	i9xx_pfit_enable(intel_crtc);



	intel_crtc_load_lut(crtc);

drivers/gpu/drm/i915/intel_lvds.c

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static void intel_lvds_get_config(struct intel_encoder *encoder, 
 * This is an exception to the general rule that mode_set doesn't turn

 * things on.

 */

static void intel_pre_pll_enable_lvds(struct intel_encoder *encoder)

static void intel_pre_enable_lvds(struct intel_encoder *encoder)

{

	struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);

	struct drm_device *dev = encoder->base.dev;
@@ -946,7 +946,7 @@ void intel_lvds_init(struct drm_device *dev) 
			 DRM_MODE_ENCODER_LVDS);



	intel_encoder->enable = intel_enable_lvds;

	intel_encoder->pre_pll_enable = intel_pre_pll_enable_lvds;

	intel_encoder->pre_enable = intel_pre_enable_lvds;

	intel_encoder->compute_config = intel_lvds_compute_config;

	intel_encoder->disable = intel_disable_lvds;

	intel_encoder->get_hw_state = intel_lvds_get_hw_state;