| Message ID | 20201217150812.3247405-1-jbrunet@baylibre.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 671ee4db952449acde126965bf76817a3159040d |
| Headers | show |
| Series | ASoC: meson: axg-tdm-interface: fix loopback | expand |
On Thu, Dec 17, 2020 at 04:08:12PM +0100, Jerome Brunet wrote: > When the axg-tdm-interface was introduced, the backend DAI was marked as an > endpoint when DPCM was walking the DAPM graph to find a its BE. > > It is no longer the case since this > commit 8dd26dff00c0 ("ASoC: dapm: Fix handling of custom_stop_condition on DAPM graph walks") > Because of this, when DPCM finds a BE it does everything it needs on the > DAIs but it won't power up the widgets between the FE and the BE if there > is no actual endpoint after the BE. > > On meson-axg HWs, the loopback is a special DAI of the tdm-interface BE. > It is only linked to the dummy codec since there no actual HW after it. > >From the DAPM perspective, the DAI has no endpoint. Because of this, the TDM > decoder, which is a widget between the FE and BE is not powered up. > > >From the user perspective, everything seems fine but no data is produced. > > Connecting the Loopback DAI to a dummy DAPM endpoint solves the problem. > > Fixes: 8dd26dff00c0 ("ASoC: dapm: Fix handling of custom_stop_condition on DAPM graph walks") > Cc: Charles Keepax <ckeepax@opensource.cirrus.com> > Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> > --- Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com> Thanks, Charles
On Thu, 17 Dec 2020 16:08:12 +0100, Jerome Brunet wrote: > When the axg-tdm-interface was introduced, the backend DAI was marked as an > endpoint when DPCM was walking the DAPM graph to find a its BE. > > It is no longer the case since this > commit 8dd26dff00c0 ("ASoC: dapm: Fix handling of custom_stop_condition on DAPM graph walks") > Because of this, when DPCM finds a BE it does everything it needs on the > DAIs but it won't power up the widgets between the FE and the BE if there > is no actual endpoint after the BE. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: meson: axg-tdm-interface: fix loopback commit: 671ee4db952449acde126965bf76817a3159040d All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/meson/axg-tdm-interface.c b/sound/soc/meson/axg-tdm-interface.c index c8664ab80d45..87cac440b369 100644 --- a/sound/soc/meson/axg-tdm-interface.c +++ b/sound/soc/meson/axg-tdm-interface.c @@ -467,8 +467,20 @@ static int axg_tdm_iface_set_bias_level(struct snd_soc_component *component, return ret; } +static const struct snd_soc_dapm_widget axg_tdm_iface_dapm_widgets[] = { + SND_SOC_DAPM_SIGGEN("Playback Signal"), +}; + +static const struct snd_soc_dapm_route axg_tdm_iface_dapm_routes[] = { + { "Loopback", NULL, "Playback Signal" }, +}; + static const struct snd_soc_component_driver axg_tdm_iface_component_drv = { - .set_bias_level = axg_tdm_iface_set_bias_level, + .dapm_widgets = axg_tdm_iface_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(axg_tdm_iface_dapm_widgets), + .dapm_routes = axg_tdm_iface_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(axg_tdm_iface_dapm_routes), + .set_bias_level = axg_tdm_iface_set_bias_level, }; static const struct of_device_id axg_tdm_iface_of_match[] = {
When the axg-tdm-interface was introduced, the backend DAI was marked as an endpoint when DPCM was walking the DAPM graph to find a its BE. It is no longer the case since this commit 8dd26dff00c0 ("ASoC: dapm: Fix handling of custom_stop_condition on DAPM graph walks") Because of this, when DPCM finds a BE it does everything it needs on the DAIs but it won't power up the widgets between the FE and the BE if there is no actual endpoint after the BE. On meson-axg HWs, the loopback is a special DAI of the tdm-interface BE. It is only linked to the dummy codec since there no actual HW after it. From the DAPM perspective, the DAI has no endpoint. Because of this, the TDM decoder, which is a widget between the FE and BE is not powered up. From the user perspective, everything seems fine but no data is produced. Connecting the Loopback DAI to a dummy DAPM endpoint solves the problem. Fixes: 8dd26dff00c0 ("ASoC: dapm: Fix handling of custom_stop_condition on DAPM graph walks") Cc: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> --- sound/soc/meson/axg-tdm-interface.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)