Skip to content

Revert "hda: set correct link dma channel" #513

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
Oct 26, 2018
Merged

Revert "hda: set correct link dma channel" #513

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
4 changes: 2 additions & 2 deletions src/audio/dai.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,8 @@ static int dai_params(struct comp_dev *dev)
return -EINVAL;
}

/* get DMA channel, once the backend dma channel is known */
dd->chan = dma_channel_get(dd->dma, dev->params.be_dma_ch);
/* get DMA channel, once the stream_tag is known */
dd->chan = dma_channel_get(dd->dma, dev->params.stream_tag);
if (dd->chan < 0) {
trace_dai_error("eDc");
return -EINVAL;
Expand Down
5 changes: 3 additions & 2 deletions src/audio/host.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,10 +515,11 @@ static int host_params(struct comp_dev *dev)
host_elements_reset(dev);
#endif

dev->params.stream_tag -= 1;
/* get DMA channel from DMAC
* note: host_dma_ch is ignored by dw-dma
* note: stream_tag is ignored by dw-dma
*/
hd->chan = dma_channel_get(hd->dma, dev->params.host_dma_ch);
hd->chan = dma_channel_get(hd->dma, dev->params.stream_tag);
if (hd->chan < 0) {
trace_host_error("eDC");
return -ENODEV;
Expand Down
3 changes: 1 addition & 2 deletions src/include/uapi/ipc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,8 +500,7 @@ struct sof_ipc_stream_params {
enum sof_ipc_stream_direction direction;
enum sof_ipc_frame frame_fmt;
enum sof_ipc_buffer_format buffer_fmt;
uint32_t host_dma_ch;
uint32_t be_dma_ch;
uint32_t stream_tag;
uint32_t rate;
uint32_t channels;
uint32_t sample_valid_bytes;
Expand Down