ASoC: SOF: Intel: add trigger callback into sdw_callback

For IPC4, we need to set pipeline state in BE DAI trigger.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220708061312.25878-3-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c
index c5b65e4a06be4cb90cdd57e41b1cd442ff78716e..556e883a32edb6a533a9e7b16f8d84a8f812448c 100644 (file)
--- a/sound/soc/sof/intel/hda-dai.c
+++ b/sound/soc/sof/intel/hda-dai.c
@@ -708,8 +708,7 @@ static const struct snd_soc_dai_ops ipc3_ssp_dai_ops = {
        .shutdown = ssp_dai_shutdown,
 };
 
-static int ipc4_be_dai_trigger(struct snd_pcm_substream *substream,
-                              int cmd, struct snd_soc_dai *dai)
+static int ipc4_be_dai_common_trigger(struct snd_soc_dai *dai, int cmd, int stream)
 {
        struct snd_sof_widget *pipe_widget;
        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;
        int ret;
 
-       w = snd_soc_dai_get_widget(dai, substream->stream);
+       w = snd_soc_dai_get_widget(dai, stream);
        swidget = w->dobj.private;
        pipe_widget = swidget->pipe_widget;
        pipeline = pipe_widget->private;
@@ -753,6 +752,12 @@ static int ipc4_be_dai_trigger(struct snd_pcm_substream *substream,
        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 = {
        .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)
                        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;
        }
        default:

diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index d519b9802b3bc0ddcd253a6301e170c16e1d318b..b7fa95ea1090bfb8e03c474864c4fd0e0fced09a 100644 (file)
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -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);
 }
 
-static const struct sdw_intel_ops sdw_callback = {
+struct sdw_intel_ops sdw_callback = {
        .params_stream = sdw_params_stream,
        .free_stream = sdw_free_stream,
 };

diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h
index d684908e9a53a24ed87b1da0fb2af66dee4f9f68..5ef3e8775e364172b2dd0f69e057e3480872250e 100644 (file)
--- a/sound/soc/sof/intel/hda.h
+++ b/sound/soc/sof/intel/hda.h
@@ -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);
 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);
+extern struct sdw_intel_ops sdw_callback;
 
 #endif