From: "Mukunda,Vijendar" <vijendar.mukunda@amd.com>
To: Hui Wang <hui.wang@canonical.com>,
alsa-devel@alsa-project.org, broonie@kernel.org
Cc: stable@vger.kernel.org
Subject: Re: [PATCH v2] ASoC: amd: renoir: restore two more registers during resume
Date: Sat, 1 Aug 2020 10:56:01 +0530 [thread overview]
Message-ID: <44945fdf-8aca-8ecd-74d1-7cceb267968a@amd.com> (raw)
In-Reply-To: <20200730123138.5659-1-hui.wang@canonical.com>
On 30/07/20 6:01 pm, Hui Wang wrote:
> Recently we found an issue about the suspend and resume. If dmic is
> recording the sound, and we run suspend and resume, after the resume,
> the dmic can't work well anymore. we need to close the app and reopen
> the app, then the dmic could record the sound again.
>
> For example, we run "arecord -D hw:CARD=acp,DEV=0 -f S32_LE -c 2
> -r 48000 test.wav", then suspend and resume, after the system resume
> back, we speak to the dmic. then stop the arecord, use aplay to play
> the test.wav, we could hear the sound recorded after resume is weird,
> it is not what we speak to the dmic.
>
> I found two registers are set in the dai_hw_params(), if the two
> registers are set during the resume, this issue could be fixed.
> Move the code of the dai_hw_params() into the pdm_dai_trigger(), then
> these two registers will be set during resume since pdm_dai_trigger()
> will be called during resume. And delete the empty function
> dai_hw_params().
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Hui Wang <hui.wang@canonical.com>
Reviewed-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
> ---
> sound/soc/amd/renoir/acp3x-pdm-dma.c | 29 +++++++++-------------------
> 1 file changed, 9 insertions(+), 20 deletions(-)
>
> diff --git a/sound/soc/amd/renoir/acp3x-pdm-dma.c b/sound/soc/amd/renoir/acp3x-pdm-dma.c
> index 623dfd3ea705..7b14d9a81b97 100644
> --- a/sound/soc/amd/renoir/acp3x-pdm-dma.c
> +++ b/sound/soc/amd/renoir/acp3x-pdm-dma.c
> @@ -314,40 +314,30 @@ static int acp_pdm_dma_close(struct snd_soc_component *component,
> return 0;
> }
>
> -static int acp_pdm_dai_hw_params(struct snd_pcm_substream *substream,
> - struct snd_pcm_hw_params *params,
> - struct snd_soc_dai *dai)
> +static int acp_pdm_dai_trigger(struct snd_pcm_substream *substream,
> + int cmd, struct snd_soc_dai *dai)
> {
> struct pdm_stream_instance *rtd;
> + int ret;
> + bool pdm_status;
> unsigned int ch_mask;
>
> rtd = substream->runtime->private_data;
> - switch (params_channels(params)) {
> + ret = 0;
> + switch (substream->runtime->channels) {
> case TWO_CH:
> ch_mask = 0x00;
> break;
> default:
> return -EINVAL;
> }
> - rn_writel(ch_mask, rtd->acp_base + ACP_WOV_PDM_NO_OF_CHANNELS);
> - rn_writel(PDM_DECIMATION_FACTOR, rtd->acp_base +
> - ACP_WOV_PDM_DECIMATION_FACTOR);
> - return 0;
> -}
> -
> -static int acp_pdm_dai_trigger(struct snd_pcm_substream *substream,
> - int cmd, struct snd_soc_dai *dai)
> -{
> - struct pdm_stream_instance *rtd;
> - int ret;
> - bool pdm_status;
> -
> - rtd = substream->runtime->private_data;
> - ret = 0;
> switch (cmd) {
> case SNDRV_PCM_TRIGGER_START:
> case SNDRV_PCM_TRIGGER_RESUME:
> case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
> + rn_writel(ch_mask, rtd->acp_base + ACP_WOV_PDM_NO_OF_CHANNELS);
> + rn_writel(PDM_DECIMATION_FACTOR, rtd->acp_base +
> + ACP_WOV_PDM_DECIMATION_FACTOR);
> rtd->bytescount = acp_pdm_get_byte_count(rtd,
> substream->stream);
> pdm_status = check_pdm_dma_status(rtd->acp_base);
> @@ -369,7 +359,6 @@ static int acp_pdm_dai_trigger(struct snd_pcm_substream *substream,
> }
>
> static struct snd_soc_dai_ops acp_pdm_dai_ops = {
> - .hw_params = acp_pdm_dai_hw_params,
> .trigger = acp_pdm_dai_trigger,
> };
>
>
next prev parent reply other threads:[~2020-08-01 5:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-30 12:31 [PATCH v2] ASoC: amd: renoir: restore two more registers during resume Hui Wang
2020-08-01 5:26 ` Mukunda,Vijendar [this message]
2020-08-03 15:52 ` Mark Brown
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=44945fdf-8aca-8ecd-74d1-7cceb267968a@amd.com \
--to=vijendar.mukunda@amd.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=hui.wang@canonical.com \
--cc=stable@vger.kernel.org \
/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).