From: "Mukunda,Vijendar" <vijendar.mukunda@amd.com>
To: Daniel Kurtz <djkurtz@chromium.org>
Cc: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
perex@perex.cz, tiwai@suse.com, alexander.deucher@amd.com,
jclinton@chromium.org, Akshu Agrawal <akshu.agrawal@amd.com>,
Guenter Roeck <linux@roeck-us.net>,
pombredanne@nexb.com, kstewart@linuxfoundation.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 04/11] ASoC: amd: removed separate byte count variables for playback and capture
Date: Mon, 30 Apr 2018 12:55:43 +0530 [thread overview]
Message-ID: <e8f39d50-360e-cd66-aba7-8fd1aade6f49@amd.com> (raw)
In-Reply-To: <CAGS+omA4DNm7HZZUpRBJfhhY-GYGaQRU1KWBb-CTuO7qGwTXCw@mail.gmail.com>
On Monday 30 April 2018 03:11 AM, Daniel Kurtz wrote:
> Hi Vijendar,
>
> On Thu, Apr 26, 2018 at 5:15 AM Vijendar Mukunda <Vijendar.Mukunda@amd.com>
> wrote:
>
>> Removed separate byte count variables for playback and capture.
>
>> Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
>
> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
>
>> ---
>> sound/soc/amd/acp-pcm-dma.c | 19 +++++--------------
>> sound/soc/amd/acp.h | 3 +--
>> 2 files changed, 6 insertions(+), 16 deletions(-)
>
>> diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c
>> index 019f696..5f34be1 100644
>> --- a/sound/soc/amd/acp-pcm-dma.c
>> +++ b/sound/soc/amd/acp-pcm-dma.c
>> @@ -866,13 +866,8 @@ static snd_pcm_uframes_t acp_dma_pointer(struct
> snd_pcm_substream *substream)
>> buffersize = frames_to_bytes(runtime, runtime->buffer_size);
>> bytescount = acp_get_byte_count(rtd);
>
>> - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
>> - if (bytescount > rtd->i2ssp_renderbytescount)
>> - bytescount = bytescount -
> rtd->i2ssp_renderbytescount;
>> - } else {
>> - if (bytescount > rtd->i2ssp_capturebytescount)
>> - bytescount = bytescount -
> rtd->i2ssp_capturebytescount;
>> - }
>> + if (bytescount > rtd->bytescount)
>> + bytescount = bytescount - rtd->bytescount;
>
> nit, this could be:
> bytescount -= rtd->bytescount;
we will fix it and will share fresh patch.
>
>> pos = do_div(bytescount, buffersize);
>> return bytes_to_frames(runtime, pos);
>> }
>> @@ -921,9 +916,9 @@ static int acp_dma_trigger(struct snd_pcm_substream
> *substream, int cmd)
>> case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
>> case SNDRV_PCM_TRIGGER_RESUME:
>> bytescount = acp_get_byte_count(rtd);
>> + if (rtd->bytescount == 0)
>> + rtd->bytescount = bytescount;
>> if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
>> - if (rtd->i2ssp_renderbytescount == 0)
>> - rtd->i2ssp_renderbytescount = bytescount;
>> acp_dma_start(rtd->acp_mmio, rtd->ch1, false);
>> while (acp_reg_read(rtd->acp_mmio,
> mmACP_DMA_CH_STS) &
>> BIT(rtd->ch1)) {
>> @@ -934,9 +929,6 @@ static int acp_dma_trigger(struct snd_pcm_substream
> *substream, int cmd)
>> }
>> cpu_relax();
>> }
>> - } else {
>> - if (rtd->i2ssp_capturebytescount == 0)
>> - rtd->i2ssp_capturebytescount = bytescount;
>> }
>> acp_dma_start(rtd->acp_mmio, rtd->ch2, true);
>> ret = 0;
>> @@ -947,12 +939,11 @@ static int acp_dma_trigger(struct snd_pcm_substream
> *substream, int cmd)
>> if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
>> acp_dma_stop(rtd->acp_mmio, rtd->ch1);
>> ret = acp_dma_stop(rtd->acp_mmio, rtd->ch2);
>> - rtd->i2ssp_renderbytescount = 0;
>> } else {
>> acp_dma_stop(rtd->acp_mmio, rtd->ch2);
>> ret = acp_dma_stop(rtd->acp_mmio, rtd->ch1);
>> - rtd->i2ssp_capturebytescount = 0;
>> }
>> + rtd->bytescount = 0;
>> break;
>> default:
>> ret = -EINVAL;
>> diff --git a/sound/soc/amd/acp.h b/sound/soc/amd/acp.h
>> index 3b076c6..82470bc 100644
>> --- a/sound/soc/amd/acp.h
>> +++ b/sound/soc/amd/acp.h
>> @@ -93,8 +93,7 @@ struct audio_substream_data {
>> u32 byte_cnt_high_reg_offset;
>> u32 byte_cnt_low_reg_offset;
>> uint64_t size;
>> - u64 i2ssp_renderbytescount;
>> - u64 i2ssp_capturebytescount;
>> + u64 bytescount;
>> void __iomem *acp_mmio;
>> };
>
>> --
>> 2.7.4
next prev parent reply other threads:[~2018-04-30 7:25 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-26 11:15 [PATCH 01/11] ASoC: amd: rename audio_substream_data variable Vijendar Mukunda
2018-04-26 11:15 ` [PATCH 02/11] ASoC: amd: dma config parameters changes Vijendar Mukunda
2018-04-29 21:49 ` Daniel Kurtz
2018-04-30 8:09 ` Mukunda,Vijendar
2018-04-26 11:15 ` [PATCH 03/11] ASoC: amd: added byte count register offset variables to rtd Vijendar Mukunda
2018-04-29 21:39 ` Daniel Kurtz
2018-04-30 7:24 ` Mukunda,Vijendar
2018-04-26 11:15 ` [PATCH 04/11] ASoC: amd: removed separate byte count variables for playback and capture Vijendar Mukunda
2018-04-29 21:41 ` Daniel Kurtz
2018-04-30 7:25 ` Mukunda,Vijendar [this message]
2018-04-26 11:15 ` [PATCH 05/11] ASoC: amd: pte offset related dma driver changes Vijendar Mukunda
2018-04-29 21:48 ` Daniel Kurtz
2018-04-30 8:19 ` Mukunda,Vijendar
2018-04-26 11:15 ` [PATCH 06/11] ASoC: amd: sram bank update changes Vijendar Mukunda
2018-04-29 21:47 ` Daniel Kurtz
2018-04-30 8:17 ` Mukunda,Vijendar
2018-04-26 11:15 ` [PATCH 07/11] ASoC: amd: memory freeing for rtd structure Vijendar Mukunda
2018-05-21 15:48 ` Applied "ASoC: amd: memory release for rtd structure" to the asoc tree Mark Brown
2018-04-26 11:15 ` [PATCH 08/11] ASoC: AMD: Move clk enable from hw_params/free to startup/shutdown Vijendar Mukunda
2018-05-21 15:48 ` Applied "ASoC: AMD: Move clk enable from hw_params/free to startup/shutdown" to the asoc tree Mark Brown
2018-04-26 11:15 ` [PATCH 09/11] ASoC: AMD: Fix clocks in CZ DA7219 machine driver Vijendar Mukunda
2018-04-29 21:51 ` Daniel Kurtz
2018-05-21 15:48 ` Applied "ASoC: AMD: Fix clocks in CZ DA7219 machine driver" to the asoc tree Mark Brown
2018-04-26 11:15 ` [PATCH 10/11] ASoC: AMD: Add const to snd_soc_ops instances Vijendar Mukunda
2018-04-29 21:52 ` Daniel Kurtz
2018-05-21 15:48 ` Applied "ASoC: AMD: Add const to snd_soc_ops instances" to the asoc tree Mark Brown
2018-04-26 11:15 ` [PATCH v2 11/11] ASoC: amd: dma driver changes for bt i2s instance Vijendar Mukunda
2018-04-26 14:19 ` Applied "ASoC: amd: rename audio_substream_data variable" to the asoc tree 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=e8f39d50-360e-cd66-aba7-8fd1aade6f49@amd.com \
--to=vijendar.mukunda@amd.com \
--cc=akshu.agrawal@amd.com \
--cc=alexander.deucher@amd.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=djkurtz@chromium.org \
--cc=gregkh@linuxfoundation.org \
--cc=jclinton@chromium.org \
--cc=kstewart@linuxfoundation.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=perex@perex.cz \
--cc=pombredanne@nexb.com \
--cc=tiwai@suse.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).