ASoC: SOF: Intel: hda-dai: add codec_dai_set_stream callback

The existing code for HDAudio DAIs cannot be extended to other types
of DAIs, specific programming sequences need to be abstracted
away. Start here with hiding the stream_tag needed by the HDAudio
codec_dai.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20230602205620.310879-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda-dai-ops.c b/sound/soc/sof/intel/hda-dai-ops.c
index 1e58256c800339f2870b5402bcf8b4f893c10c31..2d2953cee1d8ab0a68f3d12d6701d7dc2907a908 100644 (file)
--- a/sound/soc/sof/intel/hda-dai-ops.c
+++ b/sound/soc/sof/intel/hda-dai-ops.c
@@ -175,6 +175,17 @@ static void hda_reset_hext_stream(struct snd_sof_dev *sdev, struct hdac_ext_stre
        snd_hdac_ext_stream_reset(hext_stream);
 }
 
+static void hda_codec_dai_set_stream(struct snd_sof_dev *sdev,
+                                    struct snd_pcm_substream *substream,
+                                    struct hdac_stream *hstream)
+{
+       struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
+       struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
+
+       /* set the hdac_stream in the codec dai */
+       snd_soc_dai_set_stream(codec_dai, hstream, substream->stream);
+}
+
 static int hda_ipc4_pre_trigger(struct snd_sof_dev *sdev, struct snd_soc_dai *cpu_dai,
                                struct snd_pcm_substream *substream, int cmd)
 {
@@ -307,7 +318,8 @@ static const struct hda_dai_widget_dma_ops hda_ipc4_dma_ops = {
        .reset_hext_stream = hda_reset_hext_stream,
        .pre_trigger = hda_ipc4_pre_trigger,
        .trigger = hda_trigger,
-       .post_trigger = hda_ipc4_post_trigger
+       .post_trigger = hda_ipc4_post_trigger,
+       .codec_dai_set_stream = hda_codec_dai_set_stream,
 };
 
 static const struct hda_dai_widget_dma_ops hda_ipc4_chain_dma_ops = {
@@ -317,6 +329,7 @@ static const struct hda_dai_widget_dma_ops hda_ipc4_chain_dma_ops = {
        .setup_hext_stream = hda_setup_hext_stream,
        .reset_hext_stream = hda_reset_hext_stream,
        .trigger = hda_trigger,
+       .codec_dai_set_stream = hda_codec_dai_set_stream,
 };
 
 static int hda_ipc3_post_trigger(struct snd_sof_dev *sdev, struct snd_soc_dai *cpu_dai,
@@ -350,6 +363,7 @@ static const struct hda_dai_widget_dma_ops hda_ipc3_dma_ops = {
        .reset_hext_stream = hda_reset_hext_stream,
        .trigger = hda_trigger,
        .post_trigger = hda_ipc3_post_trigger,
+       .codec_dai_set_stream = hda_codec_dai_set_stream,
 };
 
 static struct hdac_ext_stream *
@@ -376,6 +390,7 @@ static void hda_dspless_setup_hext_stream(struct snd_sof_dev *sdev,
 static const struct hda_dai_widget_dma_ops hda_dspless_dma_ops = {
        .get_hext_stream = hda_dspless_get_hext_stream,
        .setup_hext_stream = hda_dspless_setup_hext_stream,
+       .codec_dai_set_stream = hda_codec_dai_set_stream,
 };
 
 #endif

diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c
index 3d89c1923b03c73821a93afb0e96aa74b5fc8f70..0c018644347e6f2c79cb8d053d7c3a6e3f33f0fc 100644 (file)
--- a/sound/soc/sof/intel/hda-dai.c
+++ b/sound/soc/sof/intel/hda-dai.c
@@ -192,7 +192,8 @@ static int hda_link_dma_hw_params(struct snd_pcm_substream *substream,
                snd_hdac_ext_bus_link_set_stream_id(hlink, stream_tag);
 
        /* set the hdac_stream in the codec dai */
-       snd_soc_dai_set_stream(codec_dai, hdac_stream(hext_stream), substream->stream);
+       if (ops->codec_dai_set_stream)
+               ops->codec_dai_set_stream(sdev, substream, hstream);
 
        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                link_bps = codec_dai->driver->playback.sig_bits;

diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h
index 5b3dad2dadf465c40cb97548aadcf1b0d5fbb01b..02d935daab289b4863e89deb836d04cfc560c30e 100644 (file)
--- a/sound/soc/sof/intel/hda.h
+++ b/sound/soc/sof/intel/hda.h
@@ -919,6 +919,7 @@ int hda_dsp_ipc4_load_library(struct snd_sof_dev *sdev,
  * @pre_trigger: Function pointer for DAI DMA pre-trigger actions
  * @trigger: Function pointer for DAI DMA trigger actions
  * @post_trigger: Function pointer for DAI DMA post-trigger actions
+ * @codec_dai_set_stream: Function pointer to set codec-side stream information
  */
 struct hda_dai_widget_dma_ops {
        struct hdac_ext_stream *(*get_hext_stream)(struct snd_sof_dev *sdev,
@@ -938,6 +939,9 @@ struct hda_dai_widget_dma_ops {
                       struct snd_pcm_substream *substream, int cmd);
        int (*post_trigger)(struct snd_sof_dev *sdev, struct snd_soc_dai *cpu_dai,
                            struct snd_pcm_substream *substream, int cmd);
+       void (*codec_dai_set_stream)(struct snd_sof_dev *sdev,
+                                    struct snd_pcm_substream *substream,
+                                    struct hdac_stream *hstream);
 };
 
 const struct hda_dai_widget_dma_ops *