Skip to contentSkip to conversation

ASoC: Suppress early calls to snd_soc_dapm_sync()

PATCH In review Mark Brown 2 participants 3 messages Oct 7, 2011

Subsystems (2)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 ASoC: Suppress early calls to snd_soc_dapm_sync()

Ensure we only have one sync during the initial startup of the card by making snd_soc_dapm_sync() a noop on non-instantiated cards. This avoids any bounces due to things like jacks reporting their initial state on partially initialised cards. The callers that don't also get called at runtime should just be removed.

---
 sound/soc/soc-core.c |    1 +
 sound/soc/soc-dapm.c |    7 +++++++
 2 files changed, 8 insertions(+), 0 deletions(-)
sound/soc/soc-core.c +1 -0
index 2a25076..b65e3d4 100644
@@ -1498,6 +1498,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
 #endif
 
 	card->instantiated = 1;
+	snd_soc_dapm_sync(&card->dapm);
 	mutex_unlock(&card->mutex);
 	return;
 
sound/soc/soc-dapm.c +7 -0
index 8711aab..e49c56d 100644
@@ -1845,6 +1845,13 @@ static int snd_soc_dapm_set_pin(struct snd_soc_dapm_context *dapm,
  */
 int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm)
 {
+	/*
+	 * Suppress early reports (eg, jacks syncing their state) to avoid
+	 * silly DAPM runs during card startup.
+	 */
+	if (!dapm->card || !dapm->card->instantiated)
+		return 0;
+
 	return dapm_power_widgets(dapm, SND_SOC_DAPM_STREAM_NOP);
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_sync);
Signature · 1 line
1.7.6.3
#1 lore raw
Quoted 19 lines · On Friday 07 October 2011 14:34:02 Mark Brown wrote:

Ensure we only have one sync during the initial startup of the card by making snd_soc_dapm_sync() a noop on non-instantiated cards. This avoids any bounces due to things like jacks reporting their initial state on partially initialised cards. The callers that don't also get called at runtime should just be removed.

---
 sound/soc/soc-core.c |    1 +
 sound/soc/soc-dapm.c |    7 +++++++
 2 files changed, 8 insertions(+), 0 deletions(-)
sound/soc/soc-core.c +0 -0
index 2a25076..b65e3d4 100644
@@ -1498,6 +1498,7 @@ static void snd_soc_instantiate_card(struct

snd_soc_card *card) #endif

sound/soc/soc-core.c static void snd_soc_instantiate_card(struct snd_soc_card *card) · line 1501

Quoted 2 lines
sound/soc/soc-core.c +1 -0
 	card->instantiated = 1;
+	snd_soc_dapm_sync(&card->dapm);

Without prior snd_soc_dapm_new_widgets() call we just moved the kernel crash here.

Quoted 11 lines
sound/soc/soc-core.c +0 -0
 	mutex_unlock(&card->mutex);
 	return;
sound/soc/soc-dapm.c +0 -0
index 8711aab..e49c56d 100644
@@ -1845,6 +1845,13 @@ static int snd_soc_dapm_set_pin(struct

snd_soc_dapm_context *dapm, */
int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm) {

sound/soc/soc-dapm.c static int snd_soc_dapm_set_pin(struct snd_soc_dapm_context *dapm, · line 1857

Quoted 10 lines
sound/soc/soc-dapm.c +7 -0
+	/*
+	 * Suppress early reports (eg, jacks syncing their state) to avoid
+	 * silly DAPM runs during card startup.
+	 */
+	if (!dapm->card || !dapm->card->instantiated)
+		return 0;
+
 	return dapm_power_widgets(dapm, SND_SOC_DAPM_STREAM_NOP);
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_sync);

--
Péter

author
#2 lore raw
Quoted 7 lines · Péter Ujfalusi

sound/soc/soc-core.c static void snd_soc_instantiate_card(struct snd_soc_card *card) · line 1501

Quoted 2 lines · On Friday 07 October 2011 14:34:02 Mark Brown wrote:
sound/soc/soc-core.c +1 -0
 	card->instantiated = 1;
+	snd_soc_dapm_sync(&card->dapm);

Without prior snd_soc_dapm_new_widgets() call we just moved the kernel crash here.

As I keep saying new_wigets() is orthogonal to the syncing. They are two totally separate issues. There's a good solid reason why I didn't mention any issues with uninitialized widgets in the changelog which is that this patch is not intended to help with that in any way, it's intended to stop us wasting our time (and potentially introducing pops and clicks from bouncing power) performing needless syncs while starting up.

The syncs that are being suppressed are totally pointless regardless of anything else.