[Intel-gfx] [alsa-devel] [PATCH RFC 1/3] drm/i915: Avoid MST pipe handling for LPE audio

[Pierre-Louis Bossart]

On 01/27/2017 04:36 AM, Takashi Iwai wrote:
> 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 at linux.intel.com>
> Signed-off-by: Takashi Iwai <tiwai at suse.de>
> ---
>   drivers/gpu/drm/i915/intel_audio.c | 21 +++++++++++----------
>   1 file changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> index 1645ce42b898..d4e6d1136cfe 100644
> --- 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);
> +	}
> +
Cool. I missed this part, couldn't figure out where the -1 was coming from.
So do you get audio working on both of the DP ports now?