[PATCH for 2.6.40] ASoC: Fix power down for widgetless per-card DAPM context case

[PATCH for 2.6.40] ASoC: Fix power down for widgetless per-card DAPM context case

[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.

Fix this by pre-clearing power state flag of non-codec DAPM context at the
beginning of power sequence.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
---
 sound/soc/soc-dapm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 456617e..999bb08 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -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
-- 
1.7.4.4

Re: [PATCH for 2.6.40] ASoC: Fix power down for widgetless per-card DAPM context case

[Liam Girdwood]

On 26/05/11 14:32, Jarkko Nikula wrote:
> 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.
> 
> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
> ---
>  sound/soc/soc-dapm.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 

Acked-by: Liam Girdwood <lrg@ti.com>

Re: [PATCH for 2.6.40] ASoC: Fix power down for widgetless per-card DAPM context case

[Mark Brown]

On Thu, May 26, 2011 at 04:32:18PM +0300, Jarkko Nikula wrote:
> 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.