summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2024-06-04 23:00:10 +0200
committerMark Brown <broonie@kernel.org>2024-06-04 23:00:10 +0200
commit4d46b699cd0c82e55c031ab515a6267ad17b7164 (patch)
treeb81d3aedba7afe69883901725804273e7d745a8b /sound
parentASoC: codecs: ES8326: Solve headphone detection issue (diff)
parentASoC: SOF: Intel: hda-dai: remove skip_tlv label (diff)
downloadlinux-4d46b699cd0c82e55c031ab515a6267ad17b7164.tar.xz
linux-4d46b699cd0c82e55c031ab515a6267ad17b7164.zip
ASoC: SOF: Intel: hda-dai: skip tlv configuration for
Merge series from Peter Ujfalusi <peter.ujfalusi@linux.intel.com>: The sof_ipc4_dma_config_tlv() call makes no sense in case of DSPless mode since it is a configuration for the firmware.
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/sof/intel/hda-dai.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c
index ce675c22a5ab..c61d298ea6b3 100644
--- a/sound/soc/sof/intel/hda-dai.c
+++ b/sound/soc/sof/intel/hda-dai.c
@@ -379,7 +379,7 @@ static int non_hda_dai_hw_params_data(struct snd_pcm_substream *substream,
sdev = widget_to_sdev(w);
if (sdev->dspless_mode_selected)
- goto skip_tlv;
+ return 0;
/* get stream_id */
hext_stream = ops->get_hext_stream(sdev, cpu_dai, substream);
@@ -423,7 +423,6 @@ static int non_hda_dai_hw_params_data(struct snd_pcm_substream *substream,
dma_config->dma_stream_channel_map.device_count = 1;
dma_config->dma_priv_config_size = 0;
-skip_tlv:
return 0;
}
@@ -525,6 +524,9 @@ int sdw_hda_dai_hw_params(struct snd_pcm_substream *substream,
return ret;
}
+ if (sdev->dspless_mode_selected)
+ return 0;
+
ipc4_copier = widget_to_copier(w);
dma_config_tlv = &ipc4_copier->dma_config_tlv[cpu_dai_id];
dma_config = &dma_config_tlv->dma_config;