ASoC: Fix dapm_seq_compare() for multi-component
PATCH 1/2 ASoC: Fix dapm_seq_compare() for multi-component
Ensure that we keep all widget powerups in DAPM sequence by making the CODEC the last thing we compare on rather than the first thing. Also fix the fact that we're currently comparing the widget pointers rather than the CODEC pointers when we do the substraction so we won't get stable results.
--- sound/soc/soc-dapm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/soc-dapm.c +2 -2
@@ -706,12 +706,12 @@ static int dapm_seq_compare(struct snd_soc_dapm_widget *a,struct snd_soc_dapm_widget *b, int sort[]) { -if (a->codec != b->codec) -return (unsigned long )a - (unsigned long )b; if (sort[a->id] != sort[b->id]) return sort[a->id] - sort[b->id];if (a->reg != b->reg)return a->reg - b->reg; +if (a->codec != b->codec) +return (unsigned long )a->codec - (unsigned long )b->codec;return 0 ; }
Signature · 1 line
1.7.1
PATCH 2/2 ASoC: Use DAPM context rather than CODEC when constructing sequences
DAPM widgets may be associated with non-CODEC devices so compare based on the DAPM context rather than the CODEC pointer.
--- sound/soc/soc-dapm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/soc-dapm.c +2 -2
@@ -710,8 +710,8 @@ static int dapm_seq_compare(struct snd_soc_dapm_widget *a,return sort[a->id] - sort[b->id];if (a->reg != b->reg)return a->reg - b->reg; -if (a->codec != b->codec) -return (unsigned long )a->codec - (unsigned long )b->codec; +if (a->dapm != b->dapm) +return (unsigned long )a->dapm - (unsigned long )b->dapm;return 0 ; }
Signature · 1 line
1.7.1
Re: [PATCH 2/2] ASoC: Use DAPM context rather than CODEC when constructing sequences
Quoted 13 lines · On Fri, 12 Nov 2010 16:01:11 +0000 Mark Brown…
DAPM widgets may be associated with non-CODEC devices so compare based on the DAPM context rather than the CODEC pointer.
Signed-off-by Mark Brown <[email protected]>--- sound/soc/soc-dapm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)sound/soc/soc-dapm.c +0
-0
sound/soc/soc-dapm.c static int dapm_seq_compare(struct snd_soc_dapm_widget *a, · line 715
Quoted 8 lines
sound/soc/soc-dapm.c +2
-2@@ -710,8 +710,8 @@ static int dapm_seq_compare(struct snd_soc_dapm_widget *a,return sort[a->id] - sort[b->id];if (a->reg != b->reg)return a->reg - b->reg; -if (a->codec != b->codec) -return (unsigned long )a->codec - (unsigned long )b->codec; +if (a->dapm != b->dapm) +return (unsigned long )a->dapm - (unsigned long )b->dapm;
Definitely, this conversion was missing from DAPM decoupling patch.
Re: [PATCH 2/2] ASoC: Use DAPM context rather than CODEC when constructing sequences
In reply to Mark BrownQuoted 4 lines · Mark Brown
DAPM widgets may be associated with non-CODEC devices so compare based on the DAPM context rather than the CODEC pointer.
Signed-off-by Mark Brown <[email protected]>
Both
Signature · 3 lines
Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk
Quoted 18 lines · On Fri, 12 Nov 2010 16:01:10 +0000 Mark Brown…
Ensure that we keep all widget powerups in DAPM sequence by making the CODEC the last thing we compare on rather than the first thing. Also fix the fact that we're currently comparing the widget pointers rather than the CODEC pointers when we do the substraction so we won't get stable results.
Signed-off-by Mark Brown <[email protected]>--- sound/soc/soc-dapm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)sound/soc/soc-dapm.c +0
-0@@ -706,12 +706,12 @@ static int dapm_seq_compare(struct snd_soc_dapm_widget *a,struct snd_soc_dapm_widget *b, int sort[])
sound/soc/soc-dapm.c static int dapm_seq_compare(struct snd_soc_dapm_widget *a, · line 715
Quoted 10 lines
sound/soc/soc-dapm.c +2
-2{ -if (a->codec != b->codec) -return (unsigned long )a - (unsigned long )b;if (sort[a->id] != sort[b->id])return sort[a->id] - sort[b->id];if (a->reg != b->reg)return a->reg - b->reg; +if (a->codec != b->codec) +return (unsigned long )a->codec - (unsigned long )b->codec;
This sounds feasible change. What I was thinking are there any benefit which one, the register or codec is compared first but I don't think there's any practical difference.
A1, B1, A2, B2 (now)
or
A1, A2, B1, B2 (codec comparison before register)
Quoted 7 lines · Jarkko Nikula
This sounds feasible change. What I was thinking are there any benefit which one, the register or codec is compared first but I don't think there's any practical difference.
A1, B1, A2, B2 (now)
or
A1, A2, B1, B2 (codec comparison before register)
If you've got two identical CODECs it will *probably* sound smoother to alternate between the two rather than enabling one then the other - there will be less time difference between any audible issues in each path. Probably a very small chance of that having an effect but it seemed more likely to do something useful than any other scenario.