From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: Harsha Priya <harshapriya.n@intel.com>,
alsa-devel@alsa-project.org, broonie@kernel.org
Cc: yang.jie@linux.intel.com, rad@semihalf.com, zwisler@google.com,
linux-kernel@vger.kernel.org, liam.r.girdwood@linux.intel.com,
Vamshi Krishna Gopal <vamshi.krishna.gopal@intel.com>,
sathya.prakash.m.r@intel.com, brndt@google.com, mw@semihalf.com,
levinale@chromium.org, lma@semihalf.com
Subject: Re: [PATCH v6] ASoC: Intel: kbl_rt5663_rt5514_max98927: Fix kabylake_ssp_fixup function
Date: Thu, 16 Jul 2020 12:49:09 -0500 [thread overview]
Message-ID: <48a6db3a-2aef-cfca-19ec-7825573fc3da@linux.intel.com> (raw)
In-Reply-To: <1594919637-31460-1-git-send-email-harshapriya.n@intel.com>
> diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
> index 584e4f9cedc2..b261b1c466a8 100644
> --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
> +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
> @@ -379,22 +379,30 @@ static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd,
> struct snd_interval *chan = hw_param_interval(params,
> SNDRV_PCM_HW_PARAM_CHANNELS);
> struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
> - struct snd_soc_dpcm *dpcm = container_of(
> - params, struct snd_soc_dpcm, hw_params);
> - struct snd_soc_dai_link *fe_dai_link = dpcm->fe->dai_link;
> - struct snd_soc_dai_link *be_dai_link = dpcm->be->dai_link;
> + struct snd_soc_dpcm *dpcm, *rtd_dpcm;
> +
> + /*
> + * This macro will be called for playback stream
> + */
> + for_each_dpcm_fe(rtd, SNDRV_PCM_STREAM_PLAYBACK, dpcm)
> + rtd_dpcm = dpcm;
> + /*
> + * This macro will be called for capture stream
> + */
> + for_each_dpcm_fe(rtd, SNDRV_PCM_STREAM_CAPTURE, dpcm)
> + rtd_dpcm = dpcm;
is the assumption that both of those loops return the same pointer?
If yes, why not stop for the first non-NULL dpcm value?
Also wondering if you are using a loop because there's no other helper
available?
>
> /*
> * The ADSP will convert the FE rate to 48k, stereo, 24 bit
> */
> - if (!strcmp(fe_dai_link->name, "Kbl Audio Port") ||
> - !strcmp(fe_dai_link->name, "Kbl Audio Headset Playback") ||
> - !strcmp(fe_dai_link->name, "Kbl Audio Capture Port")) {
> + if (!strcmp(rtd_dpcm->fe->dai_link->name, "Kbl Audio Port") ||
> + !strcmp(rtd_dpcm->fe->dai_link->name, "Kbl Audio Headset Playback") ||
> + !strcmp(rtd_dpcm->fe->dai_link->name, "Kbl Audio Capture Port")) {
> rate->min = rate->max = 48000;
> chan->min = chan->max = 2;
> snd_mask_none(fmt);
> snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S24_LE);
> - } else if (!strcmp(fe_dai_link->name, "Kbl Audio DMIC cap")) {
> + } else if (!strcmp(rtd_dpcm->fe->dai_link->name, "Kbl Audio DMIC cap")) {
> if (params_channels(params) == 2 ||
> DMIC_CH(dmic_constraints) == 2)
> chan->min = chan->max = 2;
> @@ -405,7 +413,7 @@ static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd,
> * The speaker on the SSP0 supports S16_LE and not S24_LE.
> * thus changing the mask here
> */
> - if (!strcmp(be_dai_link->name, "SSP0-Codec"))
> + if (!strcmp(rtd_dpcm->be->dai_link->name, "SSP0-Codec"))
> snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S16_LE);
>
> return 0;
>
next prev parent reply other threads:[~2020-07-16 17:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-16 17:13 [PATCH v6] ASoC: Intel: kbl_rt5663_rt5514_max98927: Fix kabylake_ssp_fixup function Harsha Priya
2020-07-16 17:49 ` Pierre-Louis Bossart [this message]
2020-07-16 18:04 ` N, Harshapriya
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=48a6db3a-2aef-cfca-19ec-7825573fc3da@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=brndt@google.com \
--cc=broonie@kernel.org \
--cc=harshapriya.n@intel.com \
--cc=levinale@chromium.org \
--cc=liam.r.girdwood@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lma@semihalf.com \
--cc=mw@semihalf.com \
--cc=rad@semihalf.com \
--cc=sathya.prakash.m.r@intel.com \
--cc=vamshi.krishna.gopal@intel.com \
--cc=yang.jie@linux.intel.com \
--cc=zwisler@google.com \
/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).