summaryrefslogtreecommitdiffstats
path: root/sound/soc/amd
diff options
context:
space:
mode:
authorAkshu Agrawal <akshu.agrawal@amd.com>2018-09-18 03:23:13 -0400
committerMark Brown <broonie@kernel.org>2018-09-18 13:31:50 -0400
commitc50535ed6a10fcae1b64ae83c0f6b1eeb5535afc (patch)
tree85399a089d421c4dc5534e95dec27357e891066c /sound/soc/amd
parent3f24f37adbc9a1059420a9c8f857e3490a4bce5e (diff)
ASoC: AMD: Fix capture unstable in beginning for some runs
alsa_conformance_test -C hw:0,4 -p 1024 --debug would sometime show: TIME_DIFF(s) HW_LEVEL READ RATE 0.000095970 1024 1024 10670001.041992 0.042609555 1024 2048 24032.168372 0.021330364 1024 3072 48006.681930 0.021339559 1024 4096 47985.996337 The issue is that in dma pointer function we can have stale value of the register for current descriptor of channel. The register retains the number of the last descriptor that was transferred. Fix ensures that we report position, 0, till the one period worth of data is transferred. After one period of data, in handler of period completion interrupt we update the config and correct value of descriptor starts reflecting. Signed-off-by: Akshu Agrawal <akshu.agrawal@amd.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/amd')
-rw-r--r--sound/soc/amd/acp-pcm-dma.c22
1 files changed, 14 insertions, 8 deletions
diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c
index 77b265bd0505..3135e9eafd18 100644
--- a/sound/soc/amd/acp-pcm-dma.c
+++ b/sound/soc/amd/acp-pcm-dma.c
@@ -1036,16 +1036,22 @@ static snd_pcm_uframes_t acp_dma_pointer(struct snd_pcm_substream *substream)
1036 1036
1037 if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) { 1037 if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
1038 period_bytes = frames_to_bytes(runtime, runtime->period_size); 1038 period_bytes = frames_to_bytes(runtime, runtime->period_size);
1039 dscr = acp_reg_read(rtd->acp_mmio, rtd->dma_curr_dscr);
1040 if (dscr == rtd->dma_dscr_idx_1)
1041 pos = period_bytes;
1042 else
1043 pos = 0;
1044 bytescount = acp_get_byte_count(rtd); 1039 bytescount = acp_get_byte_count(rtd);
1045 if (bytescount > rtd->bytescount) 1040 if (bytescount >= rtd->bytescount)
1046 bytescount -= rtd->bytescount; 1041 bytescount -= rtd->bytescount;
1047 delay = do_div(bytescount, period_bytes); 1042 if (bytescount < period_bytes) {
1048 runtime->delay = bytes_to_frames(runtime, delay); 1043 pos = 0;
1044 } else {
1045 dscr = acp_reg_read(rtd->acp_mmio, rtd->dma_curr_dscr);
1046 if (dscr == rtd->dma_dscr_idx_1)
1047 pos = period_bytes;
1048 else
1049 pos = 0;
1050 }
1051 if (bytescount > 0) {
1052 delay = do_div(bytescount, period_bytes);
1053 runtime->delay = bytes_to_frames(runtime, delay);
1054 }
1049 } else { 1055 } else {
1050 buffersize = frames_to_bytes(runtime, runtime->buffer_size); 1056 buffersize = frames_to_bytes(runtime, runtime->buffer_size);
1051 bytescount = acp_get_byte_count(rtd); 1057 bytescount = acp_get_byte_count(rtd);