Skip to content

link dma: allocate link dma channel at dai_config #634

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
Nov 27, 2018
Merged

link dma: allocate link dma channel at dai_config #634

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

/* 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("dai_params() error: dma_channel_get() failed");
return -EINVAL;
}

/* set up callback */
dma_set_cb(dd->dma, dd->chan, DMA_IRQ_TYPE_BLOCK |
DMA_IRQ_TYPE_LLIST, dai_dma_cb, dev);
dev->is_dma_connected = 1;

/* for DAI, we should configure its frame_fmt from topology */
dev->params.frame_fmt = dconfig->frame_fmt;

Expand Down Expand Up @@ -490,8 +478,6 @@ static int dai_reset(struct comp_dev *dev)

trace_dai("dai_reset()");

dma_channel_put(dd->dma, dd->chan);

dma_sg_free(&config->elem_array);

dd->dai_pos_blks = 0;
Expand Down Expand Up @@ -663,6 +649,7 @@ static int dai_position(struct comp_dev *dev, struct sof_ipc_stream_posn *posn)
static int dai_config(struct comp_dev *dev, struct sof_ipc_dai_config *config)
{
struct dai_data *dd = comp_get_drvdata(dev);
int channel = 0;

switch (config->type) {
case SOF_DAI_INTEL_SSP:
Expand Down Expand Up @@ -726,6 +713,7 @@ static int dai_config(struct comp_dev *dev, struct sof_ipc_dai_config *config)
* this is temp until dai/hda model is changed.
*/
dev->frame_bytes = 4;
channel = config->hda.link_dma_ch;
break;
default:
/* other types of DAIs not handled for now */
Expand All @@ -740,6 +728,19 @@ static int dai_config(struct comp_dev *dev, struct sof_ipc_dai_config *config)
return -EINVAL;
}

/* channel is ignored by GP dma get function */
dd->chan = dma_channel_get(dd->dma, channel);
if (dd->chan < 0) {
trace_dai_error("dai_config() error: dma_channel_get() failed");
return -EIO;
}

/* set up callback */
dma_set_cb(dd->dma, dd->chan, DMA_IRQ_TYPE_BLOCK |
DMA_IRQ_TYPE_LLIST, dai_dma_cb, dev);

dev->is_dma_connected = 1;

return 0;
}

Expand Down
3 changes: 1 addition & 2 deletions src/include/uapi/ipc/dai-intel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ struct sof_ipc_dai_ssp_params {

/* HDA Configuration Request - SOF_IPC_DAI_HDA_CONFIG */
struct sof_ipc_dai_hda_params {
struct sof_ipc_hdr hdr;
/* TODO */
uint32_t link_dma_ch;
} __attribute__((packed));

/* DMIC Configuration Request - SOF_IPC_DAI_DMIC_CONFIG */
Expand Down