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

Commit 9c9191f3 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

drm/i915: Avoid MST pipe handling for LPE audio 



The pipe gets cleared to -1 for non-MST before the ELD audio
notification due to the MST audio support.  This makes sense for
HD-audio that received the MST handling, but it's useless for LPE
audio.  Handle the MST pipe hack conditionally only for HD-audio.

Reported-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d5d8c3a1

drivers/gpu/drm/i915/intel_audio.c

+11 −10
Original line number Diff line number Diff line
@@ -624,13 +624,14 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder, 
	dev_priv->av_enc_map[pipe] = intel_encoder;

	mutex_unlock(&dev_priv->av_mutex);



	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify) {

		/* audio drivers expect pipe = -1 to indicate Non-MST cases */

		if (intel_encoder->type != INTEL_OUTPUT_DP_MST)

			pipe = -1;



	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)

		acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr,

						 (int) port, (int) pipe);

	}



	switch (intel_encoder->type) {

	case INTEL_OUTPUT_HDMI:

		intel_lpe_audio_notify(dev_priv, connector->eld, port,
@@ -671,13 +672,13 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder) 
	dev_priv->av_enc_map[pipe] = NULL;

	mutex_unlock(&dev_priv->av_mutex);



	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify) {

		/* audio drivers expect pipe = -1 to indicate Non-MST cases */

		if (intel_encoder->type != INTEL_OUTPUT_DP_MST)

			pipe = -1;



	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)

		acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr,

						 (int) port, (int) pipe);

	}



	intel_lpe_audio_notify(dev_priv, NULL, port, 0, false, 0);

}