Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7736cde authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Takashi Iwai
Browse files

dmaengine: Add flags parameter to dmaengine_prep_dma_cyclic() 



With this parameter added to dmaengine_prep_dma_cyclic() the API will be in
sync with other dmaengine_prep_*() functions.
The dmaengine_prep_dma_cyclic() function primarily used by audio for cyclic
transfer required by ALSA, we use the from audio to ask dma drivers to
suppress interrupts (if DMA_PREP_INTERRUPT is cleared) when it is supported
on the platform.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
CC: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9d069dc0

include/linux/dmaengine.h

+2 −1
Original line number Diff line number Diff line
@@ -653,7 +653,8 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_rio_sg( 


static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_cyclic(

		struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,

		size_t period_len, enum dma_transfer_direction dir)

		size_t period_len, enum dma_transfer_direction dir,

		unsigned long flags)

{

	return chan->device->device_prep_dma_cyclic(chan, buf_addr, buf_len,

						period_len, dir, flags, NULL);

sound/soc/soc-dmaengine-pcm.c

+5 −1
Original line number Diff line number Diff line
@@ -140,14 +140,18 @@ static int dmaengine_pcm_prepare_and_submit(struct snd_pcm_substream *substream) 
	struct dma_chan *chan = prtd->dma_chan;

	struct dma_async_tx_descriptor *desc;

	enum dma_transfer_direction direction;

	unsigned long flags = DMA_CTRL_ACK;



	direction = snd_pcm_substream_to_dma_direction(substream);



	if (!substream->runtime->no_period_wakeup)

		flags |= DMA_PREP_INTERRUPT;



	prtd->pos = 0;

	desc = dmaengine_prep_dma_cyclic(chan,

		substream->runtime->dma_addr,

		snd_pcm_lib_buffer_bytes(substream),

		snd_pcm_lib_period_bytes(substream), direction);

		snd_pcm_lib_period_bytes(substream), direction, flags);



	if (!desc)

		return -ENOMEM;