Commit 58ce2aec authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-fixes-2025-05-28' of... 

Merge tag 'drm-intel-next-fixes-2025-05-28' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-next

- Fix the enabling/disabling of DP audio SDP splitting

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://lore.kernel.org/r/aDaztAmV_erxo1Am@jlahtine-mobl
parents f8bb3ed3 ed5915cf

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

+17 −10
Original line number Diff line number Diff line
@@ -397,6 +397,19 @@ hsw_audio_config_update(struct intel_encoder *encoder, 
		hsw_hdmi_audio_config_update(encoder, crtc_state);

}



static void intel_audio_sdp_split_update(const struct intel_crtc_state *crtc_state,

					 bool enable)

{

	struct intel_display *display = to_intel_display(crtc_state);

	enum transcoder trans = crtc_state->cpu_transcoder;



	if (!HAS_DP20(display))

		return;



	intel_de_rmw(display, AUD_DP_2DOT0_CTRL(trans), AUD_ENABLE_SDP_SPLIT,

		     enable && crtc_state->sdp_split_enable ? AUD_ENABLE_SDP_SPLIT : 0);

}



static void hsw_audio_codec_disable(struct intel_encoder *encoder,

				    const struct intel_crtc_state *old_crtc_state,

				    const struct drm_connector_state *old_conn_state)
@@ -430,6 +443,8 @@ static void hsw_audio_codec_disable(struct intel_encoder *encoder, 
	if (needs_wa_14020863754(display))

		intel_de_rmw(display, AUD_CHICKENBIT_REG3, DACBE_DISABLE_MIN_HBLANK_FIX, 0);



	intel_audio_sdp_split_update(old_crtc_state, false);



	mutex_unlock(&display->audio.mutex);

}
@@ -555,6 +570,8 @@ static void hsw_audio_codec_enable(struct intel_encoder *encoder, 
	if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP))

		enable_audio_dsc_wa(encoder, crtc_state);



	intel_audio_sdp_split_update(crtc_state, true);



	if (needs_wa_14020863754(display))

		intel_de_rmw(display, AUD_CHICKENBIT_REG3, 0, DACBE_DISABLE_MIN_HBLANK_FIX);
@@ -681,16 +698,6 @@ static void ibx_audio_codec_enable(struct intel_encoder *encoder, 
	mutex_unlock(&display->audio.mutex);

}



void intel_audio_sdp_split_update(const struct intel_crtc_state *crtc_state)

{

	struct intel_display *display = to_intel_display(crtc_state);

	enum transcoder trans = crtc_state->cpu_transcoder;



	if (HAS_DP20(display))

		intel_de_rmw(display, AUD_DP_2DOT0_CTRL(trans), AUD_ENABLE_SDP_SPLIT,

			     crtc_state->sdp_split_enable ? AUD_ENABLE_SDP_SPLIT : 0);

}



bool intel_audio_compute_config(struct intel_encoder *encoder,

				struct intel_crtc_state *crtc_state,

				struct drm_connector_state *conn_state)

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

+0 −1
Original line number Diff line number Diff line
@@ -31,6 +31,5 @@ int intel_audio_min_cdclk(const struct intel_crtc_state *crtc_state); 
void intel_audio_init(struct intel_display *display);

void intel_audio_register(struct intel_display *display);

void intel_audio_deinit(struct intel_display *display);

void intel_audio_sdp_split_update(const struct intel_crtc_state *crtc_state);



#endif /* __INTEL_AUDIO_H__ */

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

+0 −3
Original line number Diff line number Diff line
@@ -3507,9 +3507,6 @@ static void intel_ddi_enable(struct intel_atomic_state *state, 


	intel_vrr_transcoder_enable(crtc_state);



	/* Enable/Disable DP2.0 SDP split config before transcoder */

	intel_audio_sdp_split_update(crtc_state);



	/* 128b/132b SST */

	if (!is_hdmi && intel_dp_is_uhbr(crtc_state)) {

		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);

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

+0 −2
Original line number Diff line number Diff line
@@ -1328,8 +1328,6 @@ static void mst_stream_enable(struct intel_atomic_state *state, 
			     FECSTALL_DIS_DPTSTREAM_DPTTG,

			     pipe_config->fec_enable ? FECSTALL_DIS_DPTSTREAM_DPTTG : 0);



	intel_audio_sdp_split_update(pipe_config);



	intel_enable_transcoder(pipe_config);



	for_each_pipe_crtc_modeset_enable(display, pipe_crtc, pipe_config, i) {