From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org, intel-gfx@lists.freedesktop.org
Subject: Re: [alsa-devel] [PATCH RFC 1/3] drm/i915: Avoid MST pipe handling for LPE audio
Date: Fri, 27 Jan 2017 08:15:14 -0600 [thread overview]
Message-ID: <7571f479-40d2-7f0d-8fc3-a620ae6b2ac5@linux.intel.com> (raw)
In-Reply-To: <20170127103631.25302-2-tiwai@suse.de>
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@linux.intel.com>
> Signed-off-by: Takashi Iwai <tiwai@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?
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-01-27 14:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-27 10:36 [PATCH RFC 0/3] Pass pipe to LPE audio Takashi Iwai
2017-01-27 10:36 ` [PATCH RFC 1/3] drm/i915: Avoid MST pipe handling for " Takashi Iwai
2017-01-27 14:15 ` Pierre-Louis Bossart [this message]
2017-01-27 14:17 ` [alsa-devel] " Takashi Iwai
2017-01-27 10:36 ` [PATCH RFC 2/3] drm/i915: Pass pipe to LPE audio notification Takashi Iwai
2017-01-27 10:36 ` [PATCH RFC 3/3] ALSA: x86: Use config base depending on the pipe Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7571f479-40d2-7f0d-8fc3-a620ae6b2ac5@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).