[PATCH 1/2] ASoC: snd_soc_dapm_put_volsw: Make sure to always update the DAPM graph

[PATCH 1/2] ASoC: snd_soc_dapm_put_volsw: Make sure to always update the DAPM graph

[Lars-Peter Clausen]

When using auto-muted controls it may happen that the register value will not
change when changing a control from enabled to disabled (since the control might
be physically disabled due to the auto-muting). We have to make sure to still
update the DAPM graph and disconnect the mixer input.

Fixes: commit 5729507 ("ASoC: dapm: Implement mixer input auto-disable")
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 sound/soc/soc-dapm.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 1871dfc..5d54dfc 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2791,22 +2791,19 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
 	mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
 
 	change = dapm_kcontrol_set_value(kcontrol, val);
-
-	if (reg != SND_SOC_NOPM) {
-		mask = mask << shift;
-		val = val << shift;
-
-		change = snd_soc_test_bits(codec, reg, mask, val);
-	}
-
 	if (change) {
 		if (reg != SND_SOC_NOPM) {
-			update.kcontrol = kcontrol;
-			update.reg = reg;
-			update.mask = mask;
-			update.val = val;
+			mask = mask << shift;
+			val = val << shift;
+
+			if (snd_soc_test_bits(codec, reg, mask, val)) {
+				update.kcontrol = kcontrol;
+				update.reg = reg;
+				update.mask = mask;
+				update.val = val;
+				card->update = &update;
+			}
 
-			card->update = &update;
 		}
 
 		ret = soc_dapm_mixer_update_power(card, kcontrol, connect);
-- 
1.8.0

[PATCH 2/2] ASoC: dapm: Fix SUSPEND -> OFF bias sequence

[Lars-Peter Clausen]

Currently when the DAPM context bias level is SUSPEND and the target bias level
is OFF dapm_pre_sequence_async() will first transition to PREPARE and
dapm_post_sequence_async() will then transition back from PREPARE to STANDBY and
then to OFF.

This patch makes sure that dapm_pre_sequence_async() only transitions to PREPARE
when either going to ON or away from ON. This avoids the extra unnecessary
transitions.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
Given that SUSPEND -> OFF transitions are rather rare and the code will still
work correctly (but inefficent) without this patch, the patch probably does not
need to go into stable.
---
 sound/soc/soc-dapm.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 5d54dfc..562cea8 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -1549,8 +1549,11 @@ static void dapm_pre_sequence_async(void *data, async_cookie_t cookie)
 				"ASoC: Failed to turn on bias: %d\n", ret);
 	}
 
-	/* Prepare for a STADDBY->ON or ON->STANDBY transition */
-	if (d->bias_level != d->target_bias_level) {
+	/* Prepare for a transition to ON or away from ON */
+	if ((d->target_bias_level == SND_SOC_BIAS_ON &&
+		 d->bias_level != SND_SOC_BIAS_ON) ||
+		(d->target_bias_level != SND_SOC_BIAS_ON &&
+		 d->bias_level == SND_SOC_BIAS_ON)) {
 		ret = snd_soc_dapm_set_bias_level(d, SND_SOC_BIAS_PREPARE);
 		if (ret != 0)
 			dev_err(d->dev,
-- 
1.8.0

Re: [PATCH 1/2] ASoC: snd_soc_dapm_put_volsw: Make sure to always update the DAPM graph

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 385 bytes --]

On Sun, May 04, 2014 at 07:17:05PM +0200, Lars-Peter Clausen wrote:
> When using auto-muted controls it may happen that the register value will not
> change when changing a control from enabled to disabled (since the control might
> be physically disabled due to the auto-muting). We have to make sure to still
> update the DAPM graph and disconnect the mixer input.

Applied, thanks.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [PATCH 2/2] ASoC: dapm: Fix SUSPEND -> OFF bias sequence

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 591 bytes --]

On Sun, May 04, 2014 at 07:17:06PM +0200, Lars-Peter Clausen wrote:

> -	/* Prepare for a STADDBY->ON or ON->STANDBY transition */
> -	if (d->bias_level != d->target_bias_level) {
> +	/* Prepare for a transition to ON or away from ON */
> +	if ((d->target_bias_level == SND_SOC_BIAS_ON &&
> +		 d->bias_level != SND_SOC_BIAS_ON) ||
> +		(d->target_bias_level != SND_SOC_BIAS_ON &&
> +		 d->bias_level == SND_SOC_BIAS_ON)) {

Can you fix the indentation so that the two sides of the or are lined
up?  It's a bit of a fiddly test and having the two cases not lined up
makes it harder to read.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]