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: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 1645ce42b8983d942dcd2390419bf74005cdaf1b..d4e6d1136cfe97de93cea43e818153ef6fb84583 100644 (file)
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -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);
 
-       /* 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)
+       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;
                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);
 
-       /* 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)
+       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;
                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);
 }