kevin/linux
1
Fork 0
Code

ALSA: dmaengine: Synchronize dma channel after drop()

Browse Source 
Sometimes the stream may be stopped due to XRUN events, in which case
the userspace can call snd_pcm_drop() and snd_pcm_prepare() to stop and
start the stream again.

In these cases, we must wait for the DMA channel to synchronize before
marking the stream as prepared for playback, as the DMA channel gets
stopped by drop() without any synchronization. Make sure the ALSA core
synchronizes the DMA channel by adding a sync_stop() hook.

Reviewed-by: Peter Ujfalusi <peter.ujfalusi@gmail.com>
Signed-off-by: Jai Luthra <j-luthra@ti.com>
Link: https://lore.kernel.org/r/20240611-asoc_next-v3-1-fcfd84b12164@ti.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Jai Luthra 2024-06-11 18:02:55 +05:30 committed by Mark Brown
parent b9dd212b14
commit e8343410dd
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/dmaengine_pcm.h
View File

@ -36,6 +36,7 @@ snd_pcm_uframes_t snd_dmaengine_pcm_pointer_no_residue(struct snd_pcm_substream
int snd_dmaengine_pcm_open(struct snd_pcm_substream *substream, int snd_dmaengine_pcm_open(struct snd_pcm_substream *substream,
struct dma_chan *chan); struct dma_chan *chan);
int snd_dmaengine_pcm_close(struct snd_pcm_substream *substream); int snd_dmaengine_pcm_close(struct snd_pcm_substream *substream);
int snd_dmaengine_pcm_sync_stop(struct snd_pcm_substream *substream);
int snd_dmaengine_pcm_open_request_chan(struct snd_pcm_substream *substream, int snd_dmaengine_pcm_open_request_chan(struct snd_pcm_substream *substream,
dma_filter_fn filter_fn, void *filter_data); dma_filter_fn filter_fn, void *filter_data);

10
sound/core/pcm_dmaengine.c
View File

@ -349,6 +349,16 @@ int snd_dmaengine_pcm_open_request_chan(struct snd_pcm_substream *substream,
} }
EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_open_request_chan); EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_open_request_chan);
int snd_dmaengine_pcm_sync_stop(struct snd_pcm_substream *substream)
{
struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);
dmaengine_synchronize(prtd->dma_chan);
return 0;
}
EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_sync_stop);
/** /**
* snd_dmaengine_pcm_close - Close a dmaengine based PCM substream * snd_dmaengine_pcm_close - Close a dmaengine based PCM substream
* @substream: PCM substream * @substream: PCM substream

8
sound/soc/soc-generic-dmaengine-pcm.c
View File

@ -318,6 +318,12 @@ static int dmaengine_copy(struct snd_soc_component *component,
return 0; return 0;
} }
static int dmaengine_pcm_sync_stop(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{
return snd_dmaengine_pcm_sync_stop(substream);
}
static const struct snd_soc_component_driver dmaengine_pcm_component = { static const struct snd_soc_component_driver dmaengine_pcm_component = {
.name = SND_DMAENGINE_PCM_DRV_NAME, .name = SND_DMAENGINE_PCM_DRV_NAME,
.probe_order = SND_SOC_COMP_ORDER_LATE, .probe_order = SND_SOC_COMP_ORDER_LATE,
@ -327,6 +333,7 @@ static const struct snd_soc_component_driver dmaengine_pcm_component = {
.trigger = dmaengine_pcm_trigger, .trigger = dmaengine_pcm_trigger,
.pointer = dmaengine_pcm_pointer, .pointer = dmaengine_pcm_pointer,
.pcm_construct = dmaengine_pcm_new, .pcm_construct = dmaengine_pcm_new,
.sync_stop = dmaengine_pcm_sync_stop,
}; };
static const struct snd_soc_component_driver dmaengine_pcm_component_process = { static const struct snd_soc_component_driver dmaengine_pcm_component_process = {
@ -339,6 +346,7 @@ static const struct snd_soc_component_driver dmaengine_pcm_component_process = {
.pointer = dmaengine_pcm_pointer, .pointer = dmaengine_pcm_pointer,
.copy = dmaengine_copy, .copy = dmaengine_copy,
.pcm_construct = dmaengine_pcm_new, .pcm_construct = dmaengine_pcm_new,
.sync_stop = dmaengine_pcm_sync_stop,
}; };
static const char * const dmaengine_pcm_dma_channel_names[] = { static const char * const dmaengine_pcm_dma_channel_names[] = {