Skip to content

dai: do not initialize pointer every trigger start #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 1 commit into from
Jul 18, 2018
Merged

dai: do not initialize pointer every trigger start #124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/audio/dai.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ struct dai_data {
uint32_t period_bytes;
completion_t complete;
int xrun; /* true if we are doing xrun recovery */
int pointer_init; /* true if buffer pointer was initialized */

uint32_t last_bytes; /* the last bytes(<period size) it copies. */
uint32_t dai_pos_blks; /* position in bytes (nearest block) */
Expand Down Expand Up @@ -211,6 +212,7 @@ static struct comp_dev *dai_new(struct sof_ipc_comp *comp)
dd->dai_pos_blks = 0;
dd->last_bytes = 0;
dd->xrun = 0;
dd->pointer_init = 0;

/* get DMA channel from DMAC1 */
dd->chan = dma_channel_get(dd->dma, 0);
Expand Down Expand Up @@ -454,6 +456,8 @@ static int dai_prepare(struct comp_dev *dev)
/* write back buffer contents from cache */
dcache_writeback_region(dma_buffer->addr, dma_buffer->size);

dd->pointer_init = 0;

/* dma reconfig not required if XRUN handling */
if (dd->xrun) {
/* after prepare, we have recovered from xrun */
Expand Down Expand Up @@ -492,6 +496,7 @@ static int dai_reset(struct comp_dev *dev)
dd->wallclock = 0;
dev->position = 0;
dd->xrun = 0;
dd->pointer_init = 0;
comp_set_state(dev, COMP_TRIGGER_RESET);

return 0;
Expand Down Expand Up @@ -526,6 +531,8 @@ static void dai_pointer_init(struct comp_dev *dev)
break;
}
}

dd->pointer_init = 1;
}

/* used to pass standard and bespoke command (with data) to component */
Expand All @@ -545,7 +552,8 @@ static int dai_comp_trigger(struct comp_dev *dev, int cmd)

switch (cmd) {
case COMP_TRIGGER_START:
dai_pointer_init(dev);
if (!dd->pointer_init)
dai_pointer_init(dev);
/* only start the DAI if we are not XRUN handling */
if (dd->xrun == 0) {
/* start the DAI */
Expand Down