ASoC: Fix power down for widgetless per-card DAPM context case
PATCH 1/1 ASoC: Fix power down for widgetless per-card DAPM context case
Commit 52ba67b ("ASoC: Force all DAPM contexts into the same bias state") powers up all the DAPM contexts in a card if any DAPM context becomes active. Unfortunately power down newer happens if per-card DAPM context doesn't have any widgets.
Reason for this is that power state of per-card DAPM context without widgets is never cleared and thus all the DAPM contexts remain permanently active. Test for widgetless calling DAPM context in dapm_power_widgets() doesn't work for per-card DAPM context since power change is never originating from widgetless per-card DAPM context.
Fix this by pre-clearing power state flag of non-codec DAPM context at the beginning of power sequence.
--- sound/soc/soc-dapm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/soc-dapm.c +1 -1
@@ -1110,7 +1110,7 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event)trace_snd_soc_dapm_start (card);list_for_each_entry (d, &card->dapm_list, list) -if (d->n_widgets) +if (d->n_widgets || d->codec ==NULL ) d->dev_power =0 ;/* Check which widgets we need to power and store them in
Signature · 1 line
1.7.4.4
Quoted 11 lines · Jarkko Nikula
Commit 52ba67b ("ASoC: Force all DAPM contexts into the same bias state") powers up all the DAPM contexts in a card if any DAPM context becomes active. Unfortunately power down newer happens if per-card DAPM context doesn't have any widgets.
Reason for this is that power state of per-card DAPM context without widgets is never cleared and thus all the DAPM contexts remain permanently active. Test for widgetless calling DAPM context in
dapm_power_widgets()doesn't work for per-card DAPM context since power change is never originating from widgetless per-card DAPM context.
Quoted 8 lines
Fix this by pre-clearing power state flag of non-codec DAPM context at the beginning of power sequence.
Signed-off-by Jarkko Nikula <[email protected]>--- sound/soc/soc-dapm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Mark Brown
AppliedQuoted 10 lines · Jarkko Nikula
Commit 52ba67b ("ASoC: Force all DAPM contexts into the same bias state") powers up all the DAPM contexts in a card if any DAPM context becomes active. Unfortunately power down newer happens if per-card DAPM context doesn't have any widgets.
Reason for this is that power state of per-card DAPM context without widgets is never cleared and thus all the DAPM contexts remain permanently active. Test for widgetless calling DAPM context in
dapm_power_widgets()doesn't work for per-card DAPM context since power change is never originating from widgetless per-card DAPM context.
Applied, thanks, though this is a bit of a band aid as we're currently still allowing widgetless CODECs.