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

Merge pull request #513 from thesofproject/revert-505-link-dma-id 

Revert "hda: set correct link dma channel"
This commit is contained in:
Liam Girdwood 2018-10-26 16:15:23 +01:00 committed by GitHub
parent 3f3d7c0473 26bfbfd699
commit e10126306a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio/dai.c
View File

@ -360,8 +360,8 @@ static int dai_params(struct comp_dev *dev)
return -EINVAL; return -EINVAL;
} }
/* get DMA channel, once the backend dma channel is known */ /* get DMA channel, once the stream_tag is known */
dd->chan = dma_channel_get(dd->dma, dev->params.be_dma_ch); dd->chan = dma_channel_get(dd->dma, dev->params.stream_tag);
if (dd->chan < 0) { if (dd->chan < 0) {
trace_dai_error("eDc"); trace_dai_error("eDc");
return -EINVAL; return -EINVAL;

5
src/audio/host.c
View File

@ -515,10 +515,11 @@ static int host_params(struct comp_dev *dev)
host_elements_reset(dev); host_elements_reset(dev);
#endif #endif
dev->params.stream_tag -= 1;
/* get DMA channel from DMAC /* 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) { if (hd->chan < 0) {
trace_host_error("eDC"); trace_host_error("eDC");
return -ENODEV; return -ENODEV;

3
src/include/uapi/ipc.h
View File

@ -500,8 +500,7 @@ struct sof_ipc_stream_params {
enum sof_ipc_stream_direction direction; enum sof_ipc_stream_direction direction;
enum sof_ipc_frame frame_fmt; enum sof_ipc_frame frame_fmt;
enum sof_ipc_buffer_format buffer_fmt; enum sof_ipc_buffer_format buffer_fmt;
uint32_t host_dma_ch; uint32_t stream_tag;
uint32_t be_dma_ch;
uint32_t rate; uint32_t rate;
uint32_t channels; uint32_t channels;
uint32_t sample_valid_bytes; uint32_t sample_valid_bytes;