Commit 386dd54b authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown

ALSA: core: Expand DMA buffer information

Update DMA buffer definition for snd_compr_runtime so it is represented
similarly as in snd_pcm_runtime. While at it, modify
snd_compr_set_runtime_buffer to account for newly added members.
Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
Acked-by: default avatarVinod Koul <vkoul@kernel.org>
Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200218143924.10565-2-cezary.rojewski@intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent a4877a6f
...@@ -23,7 +23,6 @@ struct snd_compr_ops; ...@@ -23,7 +23,6 @@ struct snd_compr_ops;
* struct snd_compr_runtime: runtime stream description * struct snd_compr_runtime: runtime stream description
* @state: stream state * @state: stream state
* @ops: pointer to DSP callbacks * @ops: pointer to DSP callbacks
* @dma_buffer_p: runtime dma buffer pointer
* @buffer: pointer to kernel buffer, valid only when not in mmap mode or * @buffer: pointer to kernel buffer, valid only when not in mmap mode or
* DSP doesn't implement copy * DSP doesn't implement copy
* @buffer_size: size of the above buffer * @buffer_size: size of the above buffer
...@@ -34,11 +33,14 @@ struct snd_compr_ops; ...@@ -34,11 +33,14 @@ struct snd_compr_ops;
* @total_bytes_transferred: cumulative bytes transferred by offload DSP * @total_bytes_transferred: cumulative bytes transferred by offload DSP
* @sleep: poll sleep * @sleep: poll sleep
* @private_data: driver private data pointer * @private_data: driver private data pointer
* @dma_area: virtual buffer address
* @dma_addr: physical buffer address (not accessible from main CPU)
* @dma_bytes: size of DMA area
* @dma_buffer_p: runtime dma buffer pointer
*/ */
struct snd_compr_runtime { struct snd_compr_runtime {
snd_pcm_state_t state; snd_pcm_state_t state;
struct snd_compr_ops *ops; struct snd_compr_ops *ops;
struct snd_dma_buffer *dma_buffer_p;
void *buffer; void *buffer;
u64 buffer_size; u64 buffer_size;
u32 fragment_size; u32 fragment_size;
...@@ -47,6 +49,11 @@ struct snd_compr_runtime { ...@@ -47,6 +49,11 @@ struct snd_compr_runtime {
u64 total_bytes_transferred; u64 total_bytes_transferred;
wait_queue_head_t sleep; wait_queue_head_t sleep;
void *private_data; void *private_data;
unsigned char *dma_area;
dma_addr_t dma_addr;
size_t dma_bytes;
struct snd_dma_buffer *dma_buffer_p;
}; };
/** /**
...@@ -180,19 +187,29 @@ static inline void snd_compr_drain_notify(struct snd_compr_stream *stream) ...@@ -180,19 +187,29 @@ static inline void snd_compr_drain_notify(struct snd_compr_stream *stream)
/** /**
* snd_compr_set_runtime_buffer - Set the Compress runtime buffer * snd_compr_set_runtime_buffer - Set the Compress runtime buffer
* @substream: compress substream to set * @stream: compress stream to set
* @bufp: the buffer information, NULL to clear * @bufp: the buffer information, NULL to clear
* *
* Copy the buffer information to runtime buffer when @bufp is non-NULL. * Copy the buffer information to runtime buffer when @bufp is non-NULL.
* Otherwise it clears the current buffer information. * Otherwise it clears the current buffer information.
*/ */
static inline void snd_compr_set_runtime_buffer( static inline void
struct snd_compr_stream *substream, snd_compr_set_runtime_buffer(struct snd_compr_stream *stream,
struct snd_dma_buffer *bufp) struct snd_dma_buffer *bufp)
{ {
struct snd_compr_runtime *runtime = substream->runtime; struct snd_compr_runtime *runtime = stream->runtime;
if (bufp) {
runtime->dma_buffer_p = bufp; runtime->dma_buffer_p = bufp;
runtime->dma_area = bufp->area;
runtime->dma_addr = bufp->addr;
runtime->dma_bytes = bufp->bytes;
} else {
runtime->dma_buffer_p = NULL;
runtime->dma_area = NULL;
runtime->dma_addr = 0;
runtime->dma_bytes = 0;
}
} }
int snd_compr_stop_error(struct snd_compr_stream *stream, int snd_compr_stop_error(struct snd_compr_stream *stream,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment