OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chain_dma: remove buffer_acquire from chain_dma 

remove buffer ops from chain_dma module

this is a continuation of changes
from commit 4a03699

Signed-off-by: Tobiasz Dryjanski <tobiaszx.dryjanski@intel.com>
This commit is contained in:
Tobiasz Dryjanski 2023-09-15 19:44:11 +02:00 committed by Kai Vehmanen
parent 4f42a65b66
commit d7957df17e
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/audio/chain_dma.c
View File

@ -238,12 +238,9 @@ static enum task_state chain_task_run(void *data)
* mode task will update read position based on transferred data size to avoid * mode task will update read position based on transferred data size to avoid
* overwriting valid data and write position by half buffer size. * overwriting valid data and write position by half buffer size.
*/ */
struct comp_buffer *buffer_c = buffer_acquire(cd->dma_buffer); const size_t buff_size = audio_stream_get_size(&cd->dma_buffer->stream);
const size_t buff_size = audio_stream_get_size(&buffer_c->stream);
const size_t half_buff_size = buff_size / 2; const size_t half_buff_size = buff_size / 2;
buffer_release(buffer_c);
if (!cd->first_data_received && host_avail_bytes > half_buff_size) { if (!cd->first_data_received && host_avail_bytes > half_buff_size) {
ret = dma_reload(cd->chan_link->dma->z_dev, ret = dma_reload(cd->chan_link->dma->z_dev,
cd->chan_link->index, 0, 0, cd->chan_link->index, 0, 0,
@ -510,7 +507,6 @@ static int chain_task_init(struct comp_dev *dev, uint8_t host_dma_id, uint8_t li
uint32_t fifo_size) uint32_t fifo_size)
{ {
struct chain_dma_data *cd = comp_get_drvdata(dev); struct chain_dma_data *cd = comp_get_drvdata(dev);
struct comp_buffer *buffer_c;
uint32_t addr_align; uint32_t addr_align;
size_t buff_size; size_t buff_size;
void *buff_addr; void *buff_addr;
@ -598,11 +594,9 @@ static int chain_task_init(struct comp_dev *dev, uint8_t host_dma_id, uint8_t li
} }
/* clear dma buffer */ /* clear dma buffer */
buffer_c = buffer_acquire(cd->dma_buffer); buffer_zero(cd->dma_buffer);
buffer_zero(buffer_c); buff_addr = audio_stream_get_addr(&cd->dma_buffer->stream);
buff_addr = audio_stream_get_addr(&buffer_c->stream); buff_size = audio_stream_get_size(&cd->dma_buffer->stream);
buff_size = audio_stream_get_size(&buffer_c->stream);
buffer_release(buffer_c);
ret = chain_init(dev, buff_addr, buff_size); ret = chain_init(dev, buff_addr, buff_size);
if (ret < 0) { if (ret < 0) {