ASoC: dapm - fix prefix for DAPM muxes
PATCH 1/1 ASoC: dapm - fix prefix for DAPM muxes
Make sure DAPM muxes have a valid kcontrol name instead of NULL.
--- sound/soc/soc-dapm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/soc-dapm.c +2 -2
@@ -489,10 +489,10 @@ static int dapm_new_mux(struct snd_soc_dapm_context *dapm, wlist->widgets[wlistentries -1 ] = w;if (!kcontrol) { -if (dapm->codec) +if (dapm->codec && dapm->codec->name_prefix) prefix = dapm->codec->name_prefix;else - prefix =NULL ; + prefix = w->name;if (shared) { name = w->kcontrol_news[0 ].name;
Signature · 1 line
1.7.4.1
Quoted 12 lines · On Tue, 24 May 2011 17:39:09 +0100 Liam Girdwood <[email protected]> wrote:
Make sure DAPM muxes have a valid kcontrol name instead of NULL.
Signed-off-by Liam Girdwood <[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_new_mux(struct snd_soc_dapm_context *dapm, · line 496
Quoted 10 lines
sound/soc/soc-dapm.c +2
-2@@ -489,10 +489,10 @@ static int dapm_new_mux(struct snd_soc_dapm_context *dapm, wlist->widgets[wlistentries -1 ] = w;if (!kcontrol) { -if (dapm->codec) +if (dapm->codec && dapm->codec->name_prefix) prefix = dapm->codec->name_prefix;else - prefix =NULL ; + prefix = w->name;
This didn't look correct to play with prefix. A quick look revealed that there is indeed breakage from commit af46800 ("ASoC: Implement mux control sharing") and this fix doesn't fix it on rx51.
I think the breakage must come from dapm_is_shared_kcontrol() that returns always 1 and dapm_new_mux() ends up using w->kcontrol_news [0].name instead of previous w->name.
dapm_is_shared_kcontrol() returns always 1 since it gets &w->kcontrol_news[0] as an argument and &w->kcontrol_news[i] will match when iterating the same widget with i==0.
list_for_each_entry(w, &dapm->card->widgets, list) {
for (i = 0; i < w->num_kcontrols; i++) {
if (&w->kcontrol_news[i] == kcontrol_new) {
if (w->kcontrols)
*kcontrol = w->kcontrols[i];
return 1;
}
}
}It works rx51 if I start the iteration from i==1 but it looks the actual fix is to the check that we are not iterating the same widget.
Signature · 1 line
Jarkko
Jarkko Nikula wrote at Tuesday, May 24, 2011 12:45 PM:
Quoted 45 lines · On Tue, 24 May 2011 17:39:09 +0100 Liam Girdwood <[email protected]> wrote:
Quoted 12 lines
Make sure DAPM muxes have a valid kcontrol name instead of NULL.
Signed-off-by Liam Girdwood <[email protected]>--- sound/soc/soc-dapm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)sound/soc/soc-dapm.c +0
-0sound/soc/soc-dapm.c static int dapm_new_mux(struct snd_soc_dapm_context *dapm, · line 496
Quoted 10 lines
sound/soc/soc-dapm.c +2
-2@@ -489,10 +489,10 @@ static int dapm_new_mux(struct snd_soc_dapm_context *dapm, wlist->widgets[wlistentries -1 ] = w;if (!kcontrol) { -if (dapm->codec) +if (dapm->codec && dapm->codec->name_prefix) prefix = dapm->codec->name_prefix;else - prefix =NULL ; + prefix = w->name;This didn't look correct to play with prefix. A quick look revealed that there is indeed breakage from commit af46800 ("ASoC: Implement mux control sharing") and this fix doesn't fix it on rx51.
I think the breakage must come from
dapm_is_shared_kcontrol()that returns always 1 anddapm_new_mux()ends up usingw->kcontrol_news[0].name instead of previousw->name.
dapm_is_shared_kcontrol()returns always 1 since it gets &w->kcontrol_news[0] as an argument and &w->kcontrol_news[i] will match when iterating the same widget with i==0.list_for_each_entry(w, &dapm->card->widgets, list) { for (i = 0; i < w->num_kcontrols; i++) { if (&w->kcontrol_news[i] == kcontrol_new) { if (w->kcontrols) *kcontrol = w->kcontrols[i]; return 1; } } }
Quoted 2 lines
It works rx51 if I start the iteration from i==1 but it looks the actual fix is to the check that we are not iterating the same widget.
Yes, I think just add a "struct snd_soc_dapm_widget *kcontrolw" parameter to dapm_is_shared_kcontrol(), and make the list_for_each continue if w == kcontrolw.
Sorry, I didn't test this on a system with control name prefixes.
I can whip up the patch if you want, but won't be able to test that it fixes your problems, since none of my systems have prefixes. Let me know either way.
Signature · 1 line
nvpublic
Quoted 53 lines · Stephen Warren
Jarkko Nikula wrote at Tuesday, May 24, 2011 12:45 PM:
Quoted 45 lines · On Tue, 24 May 2011 17:39:09 +0100 Liam Girdwood <[email protected]> wrote:
Quoted 12 lines
Make sure DAPM muxes have a valid kcontrol name instead of NULL.
Signed-off-by Liam Girdwood <[email protected]>--- sound/soc/soc-dapm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)sound/soc/soc-dapm.c +0
-0sound/soc/soc-dapm.c static int dapm_new_mux(struct snd_soc_dapm_context *dapm, · line 496
Quoted 10 lines
sound/soc/soc-dapm.c +2
-2@@ -489,10 +489,10 @@ static int dapm_new_mux(struct snd_soc_dapm_context *dapm, wlist->widgets[wlistentries -1 ] = w;if (!kcontrol) { -if (dapm->codec) +if (dapm->codec && dapm->codec->name_prefix) prefix = dapm->codec->name_prefix;else - prefix =NULL ; + prefix = w->name;This didn't look correct to play with prefix. A quick look revealed that there is indeed breakage from commit af46800 ("ASoC: Implement mux control sharing") and this fix doesn't fix it on rx51.
I think the breakage must come from
dapm_is_shared_kcontrol()that returns always 1 anddapm_new_mux()ends up usingw->kcontrol_news[0].name instead of previousw->name.
dapm_is_shared_kcontrol()returns always 1 since it gets &w->kcontrol_news[0] as an argument and &w->kcontrol_news[i] will match when iterating the same widget with i==0.list_for_each_entry(w, &dapm->card->widgets, list) { for (i = 0; i < w->num_kcontrols; i++) { if (&w->kcontrol_news[i] == kcontrol_new) { if (w->kcontrols) *kcontrol = w->kcontrols[i]; return 1; } } }Quoted 2 lines
It works rx51 if I start the iteration from i==1 but it looks the actual fix is to the check that we are not iterating the same widget.
Yes, I think just add a "struct
snd_soc_dapm_widget*kcontrolw" parameter todapm_is_shared_kcontrol(), and make thelist_for_eachcontinue if w == kcontrolw.
Quoted 6 lines
Sorry, I didn't test this on a system with control name prefixes.
I can whip up the patch if you want, but won't be able to test that it fixes your problems, since none of my systems have prefixes. Let me know either way.
Please do. I'll give it a test tomorrow.
Thanks !
Liam