leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC/SoundWire: Intel: add sdw BE dai trigger

Browse Source 
Merge series from Bard Liao <yung-chuan.liao@linux.intel.com>:

For SOF IPC4, we need to set pipeline state in BE DAI trigger.
This commit is contained in:
Mark Brown 2022-07-13 16:52:55 +01:00
commit 09cf6054c8
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
5 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/soundwire/intel.c
View File

@ -1004,9 +1004,18 @@ static int intel_trigger(struct snd_pcm_substream *substream, int cmd, struct sn
{ {
struct sdw_cdns *cdns = snd_soc_dai_get_drvdata(dai); struct sdw_cdns *cdns = snd_soc_dai_get_drvdata(dai);
struct sdw_intel *sdw = cdns_to_intel(cdns); struct sdw_intel *sdw = cdns_to_intel(cdns);
struct sdw_intel_link_res *res = sdw->link_res;
struct sdw_cdns_dma_data *dma; struct sdw_cdns_dma_data *dma;
int ret = 0; int ret = 0;
/*
* The .trigger callback is used to send required IPC to audio
* firmware. The .free_stream callback will still be called
* by intel_free_stream() in the TRIGGER_SUSPEND case.
*/
if (res->ops && res->ops->trigger)
res->ops->trigger(dai, cmd, substream->stream);
dma = snd_soc_dai_get_dma_data(dai, substream); dma = snd_soc_dai_get_dma_data(dai, substream);
if (!dma) { if (!dma) {
dev_err(dai->dev, "failed to get dma data in %s\n", dev_err(dai->dev, "failed to get dma data in %s\n",

1
include/linux/soundwire/sdw_intel.h
View File

@ -121,6 +121,7 @@ struct sdw_intel_ops {
struct sdw_intel_stream_params_data *params_data); struct sdw_intel_stream_params_data *params_data);
int (*free_stream)(struct device *dev, int (*free_stream)(struct device *dev,
struct sdw_intel_stream_free_data *free_data); struct sdw_intel_stream_free_data *free_data);
int (*trigger)(struct snd_soc_dai *dai, int cmd, int stream);
}; };
/** /**

14
sound/soc/sof/intel/hda-dai.c
View File

@ -708,8 +708,7 @@ static const struct snd_soc_dai_ops ipc3_ssp_dai_ops = {
.shutdown = ssp_dai_shutdown, .shutdown = ssp_dai_shutdown,
}; };
static int ipc4_be_dai_trigger(struct snd_pcm_substream *substream, static int ipc4_be_dai_common_trigger(struct snd_soc_dai *dai, int cmd, int stream)
int cmd, struct snd_soc_dai *dai)
{ {
struct snd_sof_widget *pipe_widget; struct snd_sof_widget *pipe_widget;
struct sof_ipc4_pipeline *pipeline; struct sof_ipc4_pipeline *pipeline;
@ -718,7 +717,7 @@ static int ipc4_be_dai_trigger(struct snd_pcm_substream *substream,
struct snd_sof_dev *sdev; struct snd_sof_dev *sdev;
int ret; int ret;
w = snd_soc_dai_get_widget(dai, substream->stream); w = snd_soc_dai_get_widget(dai, stream);
swidget = w->dobj.private; swidget = w->dobj.private;
pipe_widget = swidget->pipe_widget; pipe_widget = swidget->pipe_widget;
pipeline = pipe_widget->private; pipeline = pipe_widget->private;
@ -753,6 +752,12 @@ static int ipc4_be_dai_trigger(struct snd_pcm_substream *substream,
return 0; return 0;
} }
static int ipc4_be_dai_trigger(struct snd_pcm_substream *substream,
int cmd, struct snd_soc_dai *dai)
{
return ipc4_be_dai_common_trigger(dai, cmd, substream->stream);
}
static const struct snd_soc_dai_ops ipc4_dmic_dai_ops = { static const struct snd_soc_dai_ops ipc4_dmic_dai_ops = {
.trigger = ipc4_be_dai_trigger, .trigger = ipc4_be_dai_trigger,
}; };
@ -804,6 +809,9 @@ void hda_set_dai_drv_ops(struct snd_sof_dev *sdev, struct snd_sof_dsp_ops *ops)
if (!hda_use_tplg_nhlt) if (!hda_use_tplg_nhlt)
ipc4_data->nhlt = intel_nhlt_init(sdev->dev); ipc4_data->nhlt = intel_nhlt_init(sdev->dev);
if (IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE))
sdw_callback.trigger = ipc4_be_dai_common_trigger;
break; break;
} }
default: default:

2
sound/soc/sof/intel/hda.c
View File

@ -147,7 +147,7 @@ static int sdw_free_stream(struct device *dev,
return hda_ctrl_dai_widget_free(w, SOF_DAI_CONFIG_FLAGS_NONE, &data); return hda_ctrl_dai_widget_free(w, SOF_DAI_CONFIG_FLAGS_NONE, &data);
} }
static const struct sdw_intel_ops sdw_callback = { struct sdw_intel_ops sdw_callback = {
.params_stream = sdw_params_stream, .params_stream = sdw_params_stream,
.free_stream = sdw_free_stream, .free_stream = sdw_free_stream,
}; };

1
sound/soc/sof/intel/hda.h
View File

@ -842,5 +842,6 @@ irqreturn_t cnl_ipc4_irq_thread(int irq, void *context);
int cnl_ipc4_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg); int cnl_ipc4_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg);
irqreturn_t hda_dsp_ipc4_irq_thread(int irq, void *context); irqreturn_t hda_dsp_ipc4_irq_thread(int irq, void *context);
int hda_dsp_ipc4_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg); int hda_dsp_ipc4_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg);
extern struct sdw_intel_ops sdw_callback;
#endif #endif