Skip to content

hda-dma: change preload from blocking to repeating #1546

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
Jun 11, 2019
Merged

hda-dma: change preload from blocking to repeating #1546

Show file tree
Hide file tree
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
11 changes: 9 additions & 2 deletions src/audio/host.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,10 +763,17 @@ static int host_copy(struct comp_dev *dev)
/* here only do preload, further copies happen
* in host_buffer_cb()
*/
if (pipeline_is_preload(dev->pipeline)) {
if (pipeline_is_preload(dev->pipeline) && !dev->position) {
ret = dma_copy(hd->dma, hd->chan, hd->dma_buffer->size,
DMA_COPY_PRELOAD | DMA_COPY_BLOCKING);
DMA_COPY_PRELOAD);
if (ret < 0) {
if (ret == -ENODATA) {
/* preload not finished, so stop processing */
trace_host("host_copy(), preload not yet "
"finished");
return PPL_STATUS_PATH_STOP;
}

trace_host_error("host_copy() error: dma_copy() "
"failed, ret = %u", ret);
return ret;
Expand Down
9 changes: 7 additions & 2 deletions src/audio/pipeline.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,9 @@ static int pipeline_copy(struct pipeline *p)
"->comp.id = %u, dir = %u", ret,
start->comp.id, dir);

p->preload = false;
/* stop preload only after full walkthrough */
if (ret != PPL_STATUS_PATH_STOP)
p->preload = false;

return ret;
}
Expand Down Expand Up @@ -974,5 +976,8 @@ static uint64_t pipeline_task(void *arg)
}

tracev_pipe("pipeline_task() sched");
return pipeline_is_timer_driven(p) ? p->ipc_pipe.period : 0;

/* automatically reschedule for timer or not finished preload */
return (pipeline_is_timer_driven(p) || p->preload) ?
p->ipc_pipe.period : 0;
}
10 changes: 9 additions & 1 deletion src/drivers/intel/cavs/hda-dma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,11 +422,19 @@ static int hda_dma_host_copy(struct dma *dma, unsigned int channel, int bytes,

hda_dma_get_dbg_vals(chan, HDA_DBG_PRE, HDA_DBG_HOST);

if (!(flags & DMA_COPY_PRELOAD))
if (flags & DMA_COPY_PRELOAD) {
/* report lack of data if preload is not yet finished */
ret = chan->direction == DMA_DIR_HMEM_TO_LMEM ?
hda_dma_is_buffer_full(dma, chan) :
hda_dma_is_buffer_empty(dma, chan);
if (!ret)
return -ENODATA;
} else {
/* set BFPI to let host gateway know we have read size,
* which will trigger next copy start.
*/
hda_dma_inc_fp(dma, chan->index, bytes);
}

/* blocking mode copy */
if (flags & DMA_COPY_BLOCKING) {
Expand Down