Commit 7966a93a authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Push audio enable/disable further out 



Push the audio enable/disable to be the last/first thing
respectively that is done in the encoder enable/disable hooks.
The goal is to move it further out of these encoder hooks entirely.

Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231121054324.9988-5-ville.syrjala@linux.intel.com
parent e4fb7f89

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

+4 −4
Original line number Diff line number Diff line
@@ -482,10 +482,10 @@ static void intel_disable_dp(struct intel_atomic_state *state, 
{

	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);



	intel_dp->link_trained = false;



	intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state);



	intel_dp->link_trained = false;



	/*

	 * Make sure the panel is off before trying to change the mode.

	 * But also ensure that we have vdd while we switch off the panel.
@@ -686,8 +686,8 @@ static void g4x_enable_dp(struct intel_atomic_state *state, 
			  const struct drm_connector_state *conn_state)

{

	intel_enable_dp(state, encoder, pipe_config, conn_state);

	intel_audio_codec_enable(encoder, pipe_config, conn_state);

	intel_edp_backlight_on(pipe_config, conn_state);

	intel_audio_codec_enable(encoder, pipe_config, conn_state);

}



static void vlv_enable_dp(struct intel_atomic_state *state,
@@ -695,8 +695,8 @@ static void vlv_enable_dp(struct intel_atomic_state *state, 
			  const struct intel_crtc_state *pipe_config,

			  const struct drm_connector_state *conn_state)

{

	intel_audio_codec_enable(encoder, pipe_config, conn_state);

	intel_edp_backlight_on(pipe_config, conn_state);

	intel_audio_codec_enable(encoder, pipe_config, conn_state);

}



static void g4x_pre_enable_dp(struct intel_atomic_state *state,

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

+4 −8
Original line number Diff line number Diff line
@@ -3201,8 +3201,6 @@ static void intel_enable_ddi_dp(struct intel_atomic_state *state, 
	if (!dig_port->lspcon.active || intel_dp_has_hdmi_sink(&dig_port->dp))

		intel_dp_set_infoframes(encoder, true, crtc_state, conn_state);



	intel_audio_codec_enable(encoder, crtc_state, conn_state);



	trans_port_sync_stop_link_train(state, encoder, crtc_state);

}
@@ -3333,8 +3331,6 @@ static void intel_enable_ddi_hdmi(struct intel_atomic_state *state, 
	intel_de_write(dev_priv, DDI_BUF_CTL(port), buf_ctl);



	intel_wait_ddi_buf_active(dev_priv, port);



	intel_audio_codec_enable(encoder, crtc_state, conn_state);

}



static void intel_enable_ddi(struct intel_atomic_state *state,
@@ -3362,6 +3358,8 @@ static void intel_enable_ddi(struct intel_atomic_state *state, 
		intel_enable_ddi_dp(state, encoder, crtc_state, conn_state);



	intel_hdcp_enable(state, encoder, crtc_state, conn_state);



	intel_audio_codec_enable(encoder, crtc_state, conn_state);

}



static void intel_disable_ddi_dp(struct intel_atomic_state *state,
@@ -3375,8 +3373,6 @@ static void intel_disable_ddi_dp(struct intel_atomic_state *state, 


	intel_dp->link_trained = false;



	intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state);



	intel_psr_disable(intel_dp, old_crtc_state);

	intel_edp_backlight_off(old_conn_state);

	/* Disable the decompression in DP Sink */
@@ -3395,8 +3391,6 @@ static void intel_disable_ddi_hdmi(struct intel_atomic_state *state, 
	struct drm_i915_private *i915 = to_i915(encoder->base.dev);

	struct drm_connector *connector = old_conn_state->connector;



	intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state);



	if (!intel_hdmi_handle_sink_scrambling(encoder, connector,

					       false, false))

		drm_dbg_kms(&i915->drm,
@@ -3409,6 +3403,8 @@ static void intel_disable_ddi(struct intel_atomic_state *state, 
			      const struct intel_crtc_state *old_crtc_state,

			      const struct drm_connector_state *old_conn_state)

{

	intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state);



	intel_tc_port_link_cancel_reset_work(enc_to_dig_port(encoder));



	intel_hdcp_disable(to_intel_connector(old_conn_state->connector));

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

+4 −4
Original line number Diff line number Diff line
@@ -918,10 +918,10 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state, 
	drm_dbg_kms(&i915->drm, "active links %d\n",

		    intel_dp->active_mst_links);



	intel_hdcp_disable(intel_mst->connector);



	intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state);



	intel_hdcp_disable(intel_mst->connector);



	intel_dp_sink_disable_decompression(state, connector, old_crtc_state);

}
@@ -1164,9 +1164,9 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state, 


	intel_crtc_vblank_on(pipe_config);



	intel_audio_codec_enable(encoder, pipe_config, conn_state);



	intel_hdcp_enable(state, encoder, pipe_config, conn_state);



	intel_audio_codec_enable(encoder, pipe_config, conn_state);

}



static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder,