nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: tegra-alt: clear stale data in drain state

Browse Source 
For continuous mode dma, if callback for dma completion is late
their is possiblity that old state data is played out. Change
make sure once state is set to DRAINING, buffer is set to play
null samples if dma stop is late.

Bug 2456491
Bug 2456315

Change-Id: I98272205668b36faac789c2e5d683bc3bf8e835f
Signed-off-by: Dipesh Gandhi <dipeshg@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1989238
(cherry picked from commit 72222b7a7177fae6f09ee4b7124d3df30fe685f3)
Reviewed-on: https://git-master.nvidia.com/r/1989190
(cherry picked from commit 01e09612056e78b7b0542f1884bc43f559c59956)
Reviewed-on: https://git-master.nvidia.com/r/2125790
Reviewed-by: Uday Gupta <udayg@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Niranjan Dighe <ndighe@nvidia.com>
Reviewed-by: Nitin Pai <npai@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Dipesh Gandhi
2018-10-01 20:23:07 +05:30
committed by Sameer Pujar
parent f0c6c418c5
commit a897a5ec97
1 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
sound/soc/tegra-alt/utils/tegra_pcm_alt.c
View File

@@ -2,7 +2,7 @@
* tegra_alt_pcm.c - Tegra PCM driver * tegra_alt_pcm.c - Tegra PCM driver
* *
* Author: Stephen Warren <swarren@nvidia.com> * Author: Stephen Warren <swarren@nvidia.com>
* Copyright (c) 2011-2018 NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2011-2019 NVIDIA CORPORATION. All rights reserved.
* *
* Based on code copyright/by: * Based on code copyright/by:
* *
@@ -180,6 +180,41 @@ static int tegra_alt_pcm_mmap(struct snd_pcm_substream *substream,
runtime->dma_bytes); runtime->dma_bytes);
} }
static snd_pcm_uframes_t tegra_alt_pcm_pointer
(struct snd_pcm_substream *substream)
{
unsigned int pos = 0;
struct snd_pcm_runtime *runtime = substream->runtime;
snd_pcm_sframes_t appl_offset, hw_offset;
char *appl_ptr;
pos = snd_dmaengine_pcm_pointer(substream);
/* In DRAINING state pointer callback comes from dma completion, here
* we want to make sure if if dma completion callback is late we should
* not endup playing stale data.
*/
if ((runtime->status->state == SNDRV_PCM_STATE_DRAINING) &&
(substream->stream == SNDRV_PCM_STREAM_PLAYBACK)) {
appl_offset = (snd_pcm_sframes_t)(runtime->control->appl_ptr %
runtime->buffer_size);
hw_offset = bytes_to_frames(runtime, pos);
appl_ptr = runtime->dma_area + frames_to_bytes(runtime,
appl_offset);
if (hw_offset < appl_offset) {
memset(appl_ptr, 0, frames_to_bytes(runtime,
runtime->buffer_size - appl_offset));
memset(runtime->dma_area, 0, frames_to_bytes(runtime,
hw_offset));
} else
memset(appl_ptr, 0, frames_to_bytes(runtime,
hw_offset - appl_offset));
}
return pos;
}
static struct snd_pcm_ops tegra_alt_pcm_ops = { static struct snd_pcm_ops tegra_alt_pcm_ops = {
.open = tegra_alt_pcm_open, .open = tegra_alt_pcm_open,
.close = tegra_alt_pcm_close, .close = tegra_alt_pcm_close,
@@ -187,7 +222,7 @@ static struct snd_pcm_ops tegra_alt_pcm_ops = {
.hw_params = tegra_alt_pcm_hw_params, .hw_params = tegra_alt_pcm_hw_params,
.hw_free = tegra_alt_pcm_hw_free, .hw_free = tegra_alt_pcm_hw_free,
.trigger = snd_dmaengine_pcm_trigger, .trigger = snd_dmaengine_pcm_trigger,
.pointer = snd_dmaengine_pcm_pointer, .pointer = tegra_alt_pcm_pointer,
.mmap = tegra_alt_pcm_mmap, .mmap = tegra_alt_pcm_mmap,
}; };