[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20250110210730.705613-3-martin.blumenstingl@googlemail.com>
Date: Fri, 10 Jan 2025 22:07:30 +0100
From: Martin Blumenstingl <martin.blumenstingl@...glemail.com>
To: linux-sound@...r.kernel.org,
linux-amlogic@...ts.infradead.org
Cc: s.nawrocki@...sung.com,
lgirdwood@...il.com,
broonie@...nel.org,
linux-kernel@...r.kernel.org,
jbrunet@...libre.com,
Martin Blumenstingl <martin.blumenstingl@...glemail.com>
Subject: [RFC v2 2/2] ASoC: dapm: add support for preparing streams
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@...libre.com>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@...glemail.com>
---
Changes since v1:
- also call snd_soc_dai_prepare() as suggested by Jerome/Mark for the
source to keep things symmetrical (this is not strictly necessary
for the Amlogic Meson SoC as it doesn't implement the .prepare
callback in the platform drivers - but having it symmetrical means
less confusion for future platform maintainers)
sound/soc/soc-dapm.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 99521c784a9b..ebb181aac7b7 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -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;
--
2.47.1
Powered by blists - more mailing lists