]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: dapm: add support for preparing streams
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Tue, 14 Jan 2025 21:56:17 +0000 (22:56 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 15 Jan 2025 13:11:19 +0000 (13:11 +0000)
Codec driver can implement .hw_params and/or .prepare from struct
snd_soc_dai_ops. For codec-to-codec links only the former (.hw_params)
callback has been called.

On platforms like Amlogic Meson8/8b/8m2 the SoC's sound card
(sound/soc/meson/gx-card.c) uses a codec-to-codec link for the HDMI
codec output because further digital routing is required after the
backend. The new DRM HDMI (audio) codec framework (which internally
uses sound/soc/codecs/hdmi-codec.c) relies on the .prepare callback
of the hdmi-codec to be called. Implement calls to
snd_soc_dai_prepare() so the .prepare callback is called. In this
case the mandatory part is the call to prepare the sink (which is
the hdmi-codec on those platforms). Also call snd_soc_dai_prepare()
for the source to stay consistent with the rest of the code (even
though it's not strictly necessary to make the DRM HDMI codec
framework work on Amlogic Meson8/8b/8m2).

For platforms or sound cards without a codec-to-codec link with
additional parameters (which applies to most hardware) this changes
nothing as the .prepare callback is already called via
snd_pcm_do_prepare() (as well as dpcm_fe_dai_prepare() and
dpcm_be_dai_prepare()) on those.

Suggested-by: Jerome Brunet <jbrunet@baylibre.com>
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Link: https://patch.msgid.link/20250114215617.336105-3-martin.blumenstingl@googlemail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-dapm.c

index c0d2c8afe92c8d8a40b072e27a1ab416b748c411..b5116b700d7310dba4fc747731890bed26081cca 100644 (file)
@@ -4013,6 +4013,18 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
                break;
 
        case SND_SOC_DAPM_POST_PMU:
+               snd_soc_dapm_widget_for_each_source_path(w, path) {
+                       source = path->source->priv;
+
+                       snd_soc_dai_prepare(source, substream);
+               }
+
+               snd_soc_dapm_widget_for_each_sink_path(w, path) {
+                       sink = path->sink->priv;
+
+                       snd_soc_dai_prepare(sink, substream);
+               }
+
                snd_soc_dapm_widget_for_each_sink_path(w, path) {
                        sink = path->sink->priv;