Commit 0f752b21 authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915: Remove the encoder update_prepare()/complete() hooks 



The encoder update_prepare()/complete() hooks were added to hold a
TC port link reference for all outputs in the atomic state around the
whole modeset enable sequence - thus locking the ports' TC mode - and
set the TBT/DP-alt PLL type corresponding to the current TC mode.

Since nothing depends on the PLL selection before/after then encoder's
pre_pll_enable/post_pll_disable hooks are called, the above steps can be
moved to these hooks, so do that and remove the
update_prepare()/complete() hooks.

Reviewed-by: default avatarMika Kahola <mika.kahola@intel.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230323142035.1432621-30-imre.deak@intel.com
parent 450c27fc

drivers/gpu/drm/i915/display/intel_ddi.c

+12 −37
Original line number Diff line number Diff line
@@ -3060,39 +3060,6 @@ void intel_ddi_update_pipe(struct intel_atomic_state *state, 
	intel_hdcp_update_pipe(state, encoder, crtc_state, conn_state);

}



static void

intel_ddi_update_prepare(struct intel_atomic_state *state,

			 struct intel_encoder *encoder,

			 struct intel_crtc *crtc)

{

	struct drm_i915_private *i915 = to_i915(state->base.dev);

	struct intel_crtc_state *crtc_state =

		crtc ? intel_atomic_get_new_crtc_state(state, crtc) : NULL;

	int required_lanes = crtc_state ? crtc_state->lane_count : 1;



	drm_WARN_ON(state->base.dev, crtc && crtc->active);



	intel_tc_port_get_link(enc_to_dig_port(encoder),

		               required_lanes);

	if (crtc_state && crtc_state->hw.active) {

		struct intel_crtc *slave_crtc;



		intel_update_active_dpll(state, crtc, encoder);



		for_each_intel_crtc_in_pipe_mask(&i915->drm, slave_crtc,

						 intel_crtc_bigjoiner_slave_pipes(crtc_state))

			intel_update_active_dpll(state, slave_crtc, encoder);

	}

}



static void

intel_ddi_update_complete(struct intel_atomic_state *state,

			  struct intel_encoder *encoder,

			  struct intel_crtc *crtc)

{

	intel_tc_port_put_link(enc_to_dig_port(encoder));

}



static void

intel_ddi_pre_pll_enable(struct intel_atomic_state *state,

			 struct intel_encoder *encoder,
@@ -3104,9 +3071,20 @@ intel_ddi_pre_pll_enable(struct intel_atomic_state *state, 
	enum phy phy = intel_port_to_phy(dev_priv, encoder->port);

	bool is_tc_port = intel_phy_is_tc(dev_priv, phy);



	if (is_tc_port)

	if (is_tc_port) {

		struct intel_crtc *master_crtc =

			to_intel_crtc(crtc_state->uapi.crtc);

		struct intel_crtc *slave_crtc;



		intel_tc_port_get_link(dig_port, crtc_state->lane_count);



		intel_update_active_dpll(state, master_crtc, encoder);



		for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, slave_crtc,

						 intel_crtc_bigjoiner_slave_pipes(crtc_state))

			intel_update_active_dpll(state, slave_crtc, encoder);

	}



	main_link_aux_power_domain_get(dig_port, crtc_state);



	if (is_tc_port && !intel_tc_port_in_tbt_alt_mode(dig_port))
@@ -4552,9 +4530,6 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) 


		if (intel_tc_port_init(dig_port, is_legacy) < 0)

			goto err;



		encoder->update_prepare = intel_ddi_update_prepare;

		encoder->update_complete = intel_ddi_update_complete;

	}



	drm_WARN_ON(&dev_priv->drm, port > PORT_I);

drivers/gpu/drm/i915/display/intel_display.c

+0 −78
Original line number Diff line number Diff line
@@ -1320,36 +1320,11 @@ static void intel_crtc_disable_planes(struct intel_atomic_state *state, 
	intel_frontbuffer_flip(dev_priv, fb_bits);

}



/*

 * intel_connector_primary_encoder - get the primary encoder for a connector

 * @connector: connector for which to return the encoder

 *

 * Returns the primary encoder for a connector. There is a 1:1 mapping from

 * all connectors to their encoder, except for DP-MST connectors which have

 * both a virtual and a primary encoder. These DP-MST primary encoders can be

 * pointed to by as many DP-MST connectors as there are pipes.

 */

static struct intel_encoder *

intel_connector_primary_encoder(struct intel_connector *connector)

{

	struct intel_encoder *encoder;



	if (connector->mst_port)

		return &dp_to_dig_port(connector->mst_port)->base;



	encoder = intel_attached_encoder(connector);

	drm_WARN_ON(connector->base.dev, !encoder);



	return encoder;

}



static void intel_encoders_update_prepare(struct intel_atomic_state *state)

{

	struct drm_i915_private *i915 = to_i915(state->base.dev);

	struct intel_crtc_state *new_crtc_state, *old_crtc_state;

	struct intel_crtc *crtc;

	struct drm_connector_state *new_conn_state;

	struct drm_connector *connector;

	int i;



	/*
@@ -1365,57 +1340,6 @@ static void intel_encoders_update_prepare(struct intel_atomic_state *state) 
			new_crtc_state->dpll_hw_state = old_crtc_state->dpll_hw_state;

		}

	}



	if (!state->modeset)

		return;



	for_each_new_connector_in_state(&state->base, connector, new_conn_state,

					i) {

		struct intel_connector *intel_connector;

		struct intel_encoder *encoder;

		struct intel_crtc *crtc;



		if (!intel_connector_needs_modeset(state, connector))

			continue;



		intel_connector = to_intel_connector(connector);

		encoder = intel_connector_primary_encoder(intel_connector);

		if (!encoder->update_prepare)

			continue;



		crtc = new_conn_state->crtc ?

			to_intel_crtc(new_conn_state->crtc) : NULL;

		encoder->update_prepare(state, encoder, crtc);

	}

}



static void intel_encoders_update_complete(struct intel_atomic_state *state)

{

	struct drm_connector_state *new_conn_state;

	struct drm_connector *connector;

	int i;



	if (!state->modeset)

		return;



	for_each_new_connector_in_state(&state->base, connector, new_conn_state,

					i) {

		struct intel_connector *intel_connector;

		struct intel_encoder *encoder;

		struct intel_crtc *crtc;



		if (!intel_connector_needs_modeset(state, connector))

			continue;



		intel_connector = to_intel_connector(connector);

		encoder = intel_connector_primary_encoder(intel_connector);

		if (!encoder->update_complete)

			continue;



		crtc = new_conn_state->crtc ?

			to_intel_crtc(new_conn_state->crtc) : NULL;

		encoder->update_complete(state, encoder, crtc);

	}

}



static void intel_encoders_pre_pll_enable(struct intel_atomic_state *state,
@@ -7445,8 +7369,6 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) 
	/* Now enable the clocks, plane, pipe, and connectors that we set up. */

	dev_priv->display.funcs.display->commit_modeset_enables(state);



	intel_encoders_update_complete(state);



	if (state->modeset)

		intel_set_cdclk_post_plane_update(state);

drivers/gpu/drm/i915/display/intel_display_types.h

+0 −6
Original line number Diff line number Diff line
@@ -170,9 +170,6 @@ struct intel_encoder { 
	int (*compute_config_late)(struct intel_encoder *,

				   struct intel_crtc_state *,

				   struct drm_connector_state *);

	void (*update_prepare)(struct intel_atomic_state *,

			       struct intel_encoder *,

			       struct intel_crtc *);

	void (*pre_pll_enable)(struct intel_atomic_state *,

			       struct intel_encoder *,

			       const struct intel_crtc_state *,
@@ -185,9 +182,6 @@ struct intel_encoder { 
		       struct intel_encoder *,

		       const struct intel_crtc_state *,

		       const struct drm_connector_state *);

	void (*update_complete)(struct intel_atomic_state *,

				struct intel_encoder *,

				struct intel_crtc *);

	void (*disable)(struct intel_atomic_state *,

			struct intel_encoder *,

			const struct intel_crtc_state *,