Commit 02a715c3 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Pass encoder to intel_ddi_enable_pipe_clock() 



Since intel_ddi_enable_pipe_clock() was pushed down into the
encoder hooks we can pass on the encoder instead of having
to use intel_ddi_get_crtc_encoder().

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200417134720.16654-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 6b7fc6a3

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

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static void hsw_pre_enable_crt(struct intel_atomic_state *state, 


	hsw_fdi_link_train(encoder, crtc_state);



	intel_ddi_enable_pipe_clock(crtc_state);

	intel_ddi_enable_pipe_clock(encoder, crtc_state);

}



static void hsw_enable_crt(struct intel_atomic_state *state,

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

+5 −5
Original line number Diff line number Diff line
@@ -1986,11 +1986,11 @@ static void intel_ddi_get_power_domains(struct intel_encoder *encoder, 
					intel_dsc_power_domain(crtc_state));

}



void intel_ddi_enable_pipe_clock(const struct intel_crtc_state *crtc_state)

void intel_ddi_enable_pipe_clock(struct intel_encoder *encoder,

				 const struct intel_crtc_state *crtc_state)

{

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);

	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);

	struct intel_encoder *encoder = intel_ddi_get_crtc_encoder(crtc);

	enum port port = encoder->port;

	enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
@@ -3158,7 +3158,7 @@ static void tgl_ddi_pre_enable_dp(struct intel_atomic_state *state, 
	 * 7.a Configure Transcoder Clock Select to direct the Port clock to the

	 * Transcoder.

	 */

	intel_ddi_enable_pipe_clock(crtc_state);

	intel_ddi_enable_pipe_clock(encoder, crtc_state);



	/*

	 * 7.b Configure TRANS_DDI_FUNC_CTL DDI Select, DDI Mode Select & MST
@@ -3296,7 +3296,7 @@ static void hsw_ddi_pre_enable_dp(struct intel_atomic_state *state, 
	intel_ddi_enable_fec(encoder, crtc_state);



	if (!is_mst)

		intel_ddi_enable_pipe_clock(crtc_state);

		intel_ddi_enable_pipe_clock(encoder, crtc_state);



	intel_dsc_enable(encoder, crtc_state);

}
@@ -3357,7 +3357,7 @@ static void intel_ddi_pre_enable_hdmi(struct intel_atomic_state *state, 
	if (IS_GEN9_BC(dev_priv))

		skl_ddi_set_iboost(encoder, level, INTEL_OUTPUT_HDMI);



	intel_ddi_enable_pipe_clock(crtc_state);

	intel_ddi_enable_pipe_clock(encoder, crtc_state);



	intel_dig_port->set_infoframes(encoder,

				       crtc_state->has_infoframe,

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

+2 −1
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port); 
bool intel_ddi_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe);

void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state);

void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state);

void intel_ddi_enable_pipe_clock(const struct intel_crtc_state *crtc_state);

void intel_ddi_enable_pipe_clock(struct intel_encoder *encoder,

				 const struct intel_crtc_state *crtc_state);

void intel_ddi_disable_pipe_clock(const  struct intel_crtc_state *crtc_state);

void intel_ddi_set_dp_msa(const struct intel_crtc_state *crtc_state,

			  const struct drm_connector_state *conn_state);

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

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ static void intel_mst_pre_enable_dp(struct intel_atomic_state *state, 
	 * here for the following ones.

	 */

	if (INTEL_GEN(dev_priv) < 12 || !first_mst_stream)

		intel_ddi_enable_pipe_clock(pipe_config);

		intel_ddi_enable_pipe_clock(encoder, pipe_config);



	intel_ddi_set_dp_msa(pipe_config, conn_state);

CRA Git | Maintained and supported by SUSTech CRA and CCSE