| Message ID | 1635947547-24391-2-git-send-email-spujar@nvidia.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Fix kcontrol put callback in Tegra drivers | expand |
On Wed, 03 Nov 2021 14:52:17 +0100, Sameer Pujar wrote: > > The kcontrol put callback is expected to return 1 when there is change > in HW or when the update is acknowledged by driver. This would ensure > that change notifications are sent to subscribed applications. Update > the ADMAIF driver accordingly > > Fixes: f74028e159bb ("ASoC: tegra: Add Tegra210 based ADMAIF driver") > Suggested-by: Jaroslav Kysela <perex@perex.cz> > Suggested-by: Mark Brown <broonie@kernel.org> > Signed-off-by: Sameer Pujar <spujar@nvidia.com> > --- > sound/soc/tegra/tegra210_admaif.c | 23 ++++++++++++++++++----- > 1 file changed, 18 insertions(+), 5 deletions(-) > > diff --git a/sound/soc/tegra/tegra210_admaif.c b/sound/soc/tegra/tegra210_admaif.c > index bcccdf3..dc71075 100644 > --- a/sound/soc/tegra/tegra210_admaif.c > +++ b/sound/soc/tegra/tegra210_admaif.c > @@ -452,16 +452,29 @@ static int tegra_admaif_put_control(struct snd_kcontrol *kcontrol, > struct tegra_admaif *admaif = snd_soc_component_get_drvdata(cmpnt); > int value = ucontrol->value.integer.value[0]; > > - if (strstr(kcontrol->id.name, "Playback Mono To Stereo")) > + if (strstr(kcontrol->id.name, "Playback Mono To Stereo")) { > + if (admaif->mono_to_stereo[ADMAIF_TX_PATH][ec->reg] == value) > + return 0; > + > admaif->mono_to_stereo[ADMAIF_TX_PATH][ec->reg] = value; > - else if (strstr(kcontrol->id.name, "Capture Mono To Stereo")) > + } else if (strstr(kcontrol->id.name, "Capture Mono To Stereo")) { > + if (admaif->mono_to_stereo[ADMAIF_RX_PATH][ec->reg] == value) > + return 0; > + > admaif->mono_to_stereo[ADMAIF_RX_PATH][ec->reg] = value; > - else if (strstr(kcontrol->id.name, "Playback Stereo To Mono")) > + } else if (strstr(kcontrol->id.name, "Playback Stereo To Mono")) { > + if (admaif->stereo_to_mono[ADMAIF_TX_PATH][ec->reg] == value) > + return 0; > + > admaif->stereo_to_mono[ADMAIF_TX_PATH][ec->reg] = value; > - else if (strstr(kcontrol->id.name, "Capture Stereo To Mono")) > + } else if (strstr(kcontrol->id.name, "Capture Stereo To Mono")) { > + if (admaif->stereo_to_mono[ADMAIF_RX_PATH][ec->reg] == value) > + return 0; > + > admaif->stereo_to_mono[ADMAIF_RX_PATH][ec->reg] = value; > + } > > - return 0; > + return 1; Hrm, that looks too redundant. The similar checks are seen in the get part, so we may have a better helper function to reduce the string checks, something like below. BTW, independent from this patch set, I noticed that those get/put callbacks handle the wrong type. For enum ctls, you have to use ucontrol->value.enumerated.value instead of ucontrol->value.integer.value. The former is long while the latter is int, hence they may have different sizes. Such a bug could be caught if you test once with CONFIG_SND_CTL_VALIDATION=y. It's recommended to test with that config once for a new driver code. So, please submit the fix patch(es) for correcting the ctl value types, too. thanks, Takashi --- a/sound/soc/tegra/tegra210_admaif.c +++ b/sound/soc/tegra/tegra210_admaif.c @@ -424,44 +424,46 @@ static const struct snd_soc_dai_ops tegra_admaif_dai_ops = { .trigger = tegra_admaif_trigger, }; -static int tegra_admaif_get_control(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) +static unsigned int *tegra_admaif_route_val(struct snd_kcontrol *kcontrol) { struct snd_soc_component *cmpnt = snd_soc_kcontrol_component(kcontrol); struct soc_enum *ec = (struct soc_enum *)kcontrol->private_value; struct tegra_admaif *admaif = snd_soc_component_get_drvdata(cmpnt); - long *uctl_val = &ucontrol->value.integer.value[0]; if (strstr(kcontrol->id.name, "Playback Mono To Stereo")) - *uctl_val = admaif->mono_to_stereo[ADMAIF_TX_PATH][ec->reg]; + return &admaif->mono_to_stereo[ADMAIF_TX_PATH][ec->reg]; else if (strstr(kcontrol->id.name, "Capture Mono To Stereo")) - *uctl_val = admaif->mono_to_stereo[ADMAIF_RX_PATH][ec->reg]; + return &admaif->mono_to_stereo[ADMAIF_RX_PATH][ec->reg]; else if (strstr(kcontrol->id.name, "Playback Stereo To Mono")) - *uctl_val = admaif->stereo_to_mono[ADMAIF_TX_PATH][ec->reg]; + return &admaif->stereo_to_mono[ADMAIF_TX_PATH][ec->reg]; else if (strstr(kcontrol->id.name, "Capture Stereo To Mono")) - *uctl_val = admaif->stereo_to_mono[ADMAIF_RX_PATH][ec->reg]; + return &admaif->stereo_to_mono[ADMAIF_RX_PATH][ec->reg]; + return NULL; +} +static int tegra_admaif_get_control(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + unsigned int *valp = tegra_admaif_route_val(admaif, kcontrol); + + if (!valp) + return -EINVAL; + ucontrol->value.integer.value[0] = *valp; return 0; } static int tegra_admaif_put_control(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_component *cmpnt = snd_soc_kcontrol_component(kcontrol); - struct soc_enum *ec = (struct soc_enum *)kcontrol->private_value; - struct tegra_admaif *admaif = snd_soc_component_get_drvdata(cmpnt); + unsigned int *valp = tegra_admaif_route_val(admaif, kcontrol); int value = ucontrol->value.integer.value[0]; - if (strstr(kcontrol->id.name, "Playback Mono To Stereo")) - admaif->mono_to_stereo[ADMAIF_TX_PATH][ec->reg] = value; - else if (strstr(kcontrol->id.name, "Capture Mono To Stereo")) - admaif->mono_to_stereo[ADMAIF_RX_PATH][ec->reg] = value; - else if (strstr(kcontrol->id.name, "Playback Stereo To Mono")) - admaif->stereo_to_mono[ADMAIF_TX_PATH][ec->reg] = value; - else if (strstr(kcontrol->id.name, "Capture Stereo To Mono")) - admaif->stereo_to_mono[ADMAIF_RX_PATH][ec->reg] = value; - - return 0; + if (!valp) + return -EINVAL; + if (value == *valp) + return 0; + *valp = value; + return 1; } static int tegra_admaif_dai_probe(struct snd_soc_dai *dai)
On Wed, 03 Nov 2021 15:16:24 +0100, Takashi Iwai wrote: > > On Wed, 03 Nov 2021 14:52:17 +0100, > Sameer Pujar wrote: > > > > The kcontrol put callback is expected to return 1 when there is change > > in HW or when the update is acknowledged by driver. This would ensure > > that change notifications are sent to subscribed applications. Update > > the ADMAIF driver accordingly > > > > Fixes: f74028e159bb ("ASoC: tegra: Add Tegra210 based ADMAIF driver") > > Suggested-by: Jaroslav Kysela <perex@perex.cz> > > Suggested-by: Mark Brown <broonie@kernel.org> > > Signed-off-by: Sameer Pujar <spujar@nvidia.com> > > --- > > sound/soc/tegra/tegra210_admaif.c | 23 ++++++++++++++++++----- > > 1 file changed, 18 insertions(+), 5 deletions(-) > > > > diff --git a/sound/soc/tegra/tegra210_admaif.c b/sound/soc/tegra/tegra210_admaif.c > > index bcccdf3..dc71075 100644 > > --- a/sound/soc/tegra/tegra210_admaif.c > > +++ b/sound/soc/tegra/tegra210_admaif.c > > @@ -452,16 +452,29 @@ static int tegra_admaif_put_control(struct snd_kcontrol *kcontrol, > > struct tegra_admaif *admaif = snd_soc_component_get_drvdata(cmpnt); > > int value = ucontrol->value.integer.value[0]; > > > > - if (strstr(kcontrol->id.name, "Playback Mono To Stereo")) > > + if (strstr(kcontrol->id.name, "Playback Mono To Stereo")) { > > + if (admaif->mono_to_stereo[ADMAIF_TX_PATH][ec->reg] == value) > > + return 0; > > + > > admaif->mono_to_stereo[ADMAIF_TX_PATH][ec->reg] = value; > > - else if (strstr(kcontrol->id.name, "Capture Mono To Stereo")) > > + } else if (strstr(kcontrol->id.name, "Capture Mono To Stereo")) { > > + if (admaif->mono_to_stereo[ADMAIF_RX_PATH][ec->reg] == value) > > + return 0; > > + > > admaif->mono_to_stereo[ADMAIF_RX_PATH][ec->reg] = value; > > - else if (strstr(kcontrol->id.name, "Playback Stereo To Mono")) > > + } else if (strstr(kcontrol->id.name, "Playback Stereo To Mono")) { > > + if (admaif->stereo_to_mono[ADMAIF_TX_PATH][ec->reg] == value) > > + return 0; > > + > > admaif->stereo_to_mono[ADMAIF_TX_PATH][ec->reg] = value; > > - else if (strstr(kcontrol->id.name, "Capture Stereo To Mono")) > > + } else if (strstr(kcontrol->id.name, "Capture Stereo To Mono")) { > > + if (admaif->stereo_to_mono[ADMAIF_RX_PATH][ec->reg] == value) > > + return 0; > > + > > admaif->stereo_to_mono[ADMAIF_RX_PATH][ec->reg] = value; > > + } > > > > - return 0; > > + return 1; > > Hrm, that looks too redundant. The similar checks are seen in the get > part, so we may have a better helper function to reduce the string > checks, something like below. > > > BTW, independent from this patch set, I noticed that those get/put > callbacks handle the wrong type. For enum ctls, you have to use > ucontrol->value.enumerated.value instead of > ucontrol->value.integer.value. The former is long while the latter is > int, hence they may have different sizes. > > Such a bug could be caught if you test once with > CONFIG_SND_CTL_VALIDATION=y. It's recommended to test with that > config once for a new driver code. > > So, please submit the fix patch(es) for correcting the ctl value > types, too. > > > thanks, > > Takashi > > --- a/sound/soc/tegra/tegra210_admaif.c > +++ b/sound/soc/tegra/tegra210_admaif.c > @@ -424,44 +424,46 @@ static const struct snd_soc_dai_ops tegra_admaif_dai_ops = { > .trigger = tegra_admaif_trigger, > }; > > -static int tegra_admaif_get_control(struct snd_kcontrol *kcontrol, > - struct snd_ctl_elem_value *ucontrol) > +static unsigned int *tegra_admaif_route_val(struct snd_kcontrol *kcontrol) > { > struct snd_soc_component *cmpnt = snd_soc_kcontrol_component(kcontrol); > struct soc_enum *ec = (struct soc_enum *)kcontrol->private_value; > struct tegra_admaif *admaif = snd_soc_component_get_drvdata(cmpnt); > - long *uctl_val = &ucontrol->value.integer.value[0]; > > if (strstr(kcontrol->id.name, "Playback Mono To Stereo")) > - *uctl_val = admaif->mono_to_stereo[ADMAIF_TX_PATH][ec->reg]; > + return &admaif->mono_to_stereo[ADMAIF_TX_PATH][ec->reg]; > else if (strstr(kcontrol->id.name, "Capture Mono To Stereo")) > - *uctl_val = admaif->mono_to_stereo[ADMAIF_RX_PATH][ec->reg]; > + return &admaif->mono_to_stereo[ADMAIF_RX_PATH][ec->reg]; > else if (strstr(kcontrol->id.name, "Playback Stereo To Mono")) > - *uctl_val = admaif->stereo_to_mono[ADMAIF_TX_PATH][ec->reg]; > + return &admaif->stereo_to_mono[ADMAIF_TX_PATH][ec->reg]; > else if (strstr(kcontrol->id.name, "Capture Stereo To Mono")) > - *uctl_val = admaif->stereo_to_mono[ADMAIF_RX_PATH][ec->reg]; > + return &admaif->stereo_to_mono[ADMAIF_RX_PATH][ec->reg]; > + return NULL; > +} > > +static int tegra_admaif_get_control(struct snd_kcontrol *kcontrol, > + struct snd_ctl_elem_value *ucontrol) > +{ > + unsigned int *valp = tegra_admaif_route_val(admaif, kcontrol); The admaif argument is superfluous here, drop it. My patch is just for bringing an idea, and feel free to cook in your own way, of course. Takashi > + > + if (!valp) > + return -EINVAL; > + ucontrol->value.integer.value[0] = *valp; > return 0; > } > > static int tegra_admaif_put_control(struct snd_kcontrol *kcontrol, > struct snd_ctl_elem_value *ucontrol) > { > - struct snd_soc_component *cmpnt = snd_soc_kcontrol_component(kcontrol); > - struct soc_enum *ec = (struct soc_enum *)kcontrol->private_value; > - struct tegra_admaif *admaif = snd_soc_component_get_drvdata(cmpnt); > + unsigned int *valp = tegra_admaif_route_val(admaif, kcontrol); > int value = ucontrol->value.integer.value[0]; > > - if (strstr(kcontrol->id.name, "Playback Mono To Stereo")) > - admaif->mono_to_stereo[ADMAIF_TX_PATH][ec->reg] = value; > - else if (strstr(kcontrol->id.name, "Capture Mono To Stereo")) > - admaif->mono_to_stereo[ADMAIF_RX_PATH][ec->reg] = value; > - else if (strstr(kcontrol->id.name, "Playback Stereo To Mono")) > - admaif->stereo_to_mono[ADMAIF_TX_PATH][ec->reg] = value; > - else if (strstr(kcontrol->id.name, "Capture Stereo To Mono")) > - admaif->stereo_to_mono[ADMAIF_RX_PATH][ec->reg] = value; > - > - return 0; > + if (!valp) > + return -EINVAL; > + if (value == *valp) > + return 0; > + *valp = value; > + return 1; > } > > static int tegra_admaif_dai_probe(struct snd_soc_dai *dai) >
On 03. 11. 21 15:16, Takashi Iwai wrote: > On Wed, 03 Nov 2021 14:52:17 +0100, > Sameer Pujar wrote: >> >> The kcontrol put callback is expected to return 1 when there is change >> in HW or when the update is acknowledged by driver. This would ensure >> that change notifications are sent to subscribed applications. Update >> the ADMAIF driver accordingly >> >> Fixes: f74028e159bb ("ASoC: tegra: Add Tegra210 based ADMAIF driver") >> Suggested-by: Jaroslav Kysela <perex@perex.cz> >> Suggested-by: Mark Brown <broonie@kernel.org> >> Signed-off-by: Sameer Pujar <spujar@nvidia.com> >> --- >> sound/soc/tegra/tegra210_admaif.c | 23 ++++++++++++++++++----- >> 1 file changed, 18 insertions(+), 5 deletions(-) >> >> diff --git a/sound/soc/tegra/tegra210_admaif.c b/sound/soc/tegra/tegra210_admaif.c >> index bcccdf3..dc71075 100644 >> --- a/sound/soc/tegra/tegra210_admaif.c >> +++ b/sound/soc/tegra/tegra210_admaif.c >> @@ -452,16 +452,29 @@ static int tegra_admaif_put_control(struct snd_kcontrol *kcontrol, >> struct tegra_admaif *admaif = snd_soc_component_get_drvdata(cmpnt); >> int value = ucontrol->value.integer.value[0]; >> >> - if (strstr(kcontrol->id.name, "Playback Mono To Stereo")) >> + if (strstr(kcontrol->id.name, "Playback Mono To Stereo")) { >> + if (admaif->mono_to_stereo[ADMAIF_TX_PATH][ec->reg] == value) >> + return 0; >> + >> admaif->mono_to_stereo[ADMAIF_TX_PATH][ec->reg] = value; >> - else if (strstr(kcontrol->id.name, "Capture Mono To Stereo")) >> + } else if (strstr(kcontrol->id.name, "Capture Mono To Stereo")) { >> + if (admaif->mono_to_stereo[ADMAIF_RX_PATH][ec->reg] == value) >> + return 0; >> + >> admaif->mono_to_stereo[ADMAIF_RX_PATH][ec->reg] = value; >> - else if (strstr(kcontrol->id.name, "Playback Stereo To Mono")) >> + } else if (strstr(kcontrol->id.name, "Playback Stereo To Mono")) { >> + if (admaif->stereo_to_mono[ADMAIF_TX_PATH][ec->reg] == value) >> + return 0; >> + >> admaif->stereo_to_mono[ADMAIF_TX_PATH][ec->reg] = value; >> - else if (strstr(kcontrol->id.name, "Capture Stereo To Mono")) >> + } else if (strstr(kcontrol->id.name, "Capture Stereo To Mono")) { >> + if (admaif->stereo_to_mono[ADMAIF_RX_PATH][ec->reg] == value) >> + return 0; >> + >> admaif->stereo_to_mono[ADMAIF_RX_PATH][ec->reg] = value; >> + } >> >> - return 0; >> + return 1; > > Hrm, that looks too redundant. The similar checks are seen in the get > part, so we may have a better helper function to reduce the string > checks, something like below. While proposing such cleanups, I would create separate get/put callbacks for all four ops instead using strstr(). The callbacks may put the common code to one function. It may reduce the code size (and the text segment size). Jaroslav
On 11/3/2021 10:55 PM, Jaroslav Kysela wrote: > On 03. 11. 21 15:16, Takashi Iwai wrote: >> On Wed, 03 Nov 2021 14:52:17 +0100, >> Sameer Pujar wrote: >>> >>> The kcontrol put callback is expected to return 1 when there is change >>> in HW or when the update is acknowledged by driver. This would ensure >>> that change notifications are sent to subscribed applications. Update >>> the ADMAIF driver accordingly >>> >>> Fixes: f74028e159bb ("ASoC: tegra: Add Tegra210 based ADMAIF driver") >>> Suggested-by: Jaroslav Kysela <perex@perex.cz> >>> Suggested-by: Mark Brown <broonie@kernel.org> >>> Signed-off-by: Sameer Pujar <spujar@nvidia.com> >>> --- >>> sound/soc/tegra/tegra210_admaif.c | 23 ++++++++++++++++++----- >>> 1 file changed, 18 insertions(+), 5 deletions(-) >>> >>> diff --git a/sound/soc/tegra/tegra210_admaif.c >>> b/sound/soc/tegra/tegra210_admaif.c >>> index bcccdf3..dc71075 100644 >>> --- a/sound/soc/tegra/tegra210_admaif.c >>> +++ b/sound/soc/tegra/tegra210_admaif.c >>> @@ -452,16 +452,29 @@ static int tegra_admaif_put_control(struct >>> snd_kcontrol *kcontrol, >>> struct tegra_admaif *admaif = >>> snd_soc_component_get_drvdata(cmpnt); >>> int value = ucontrol->value.integer.value[0]; >>> >>> - if (strstr(kcontrol->id.name, "Playback Mono To Stereo")) >>> + if (strstr(kcontrol->id.name, "Playback Mono To Stereo")) { >>> + if (admaif->mono_to_stereo[ADMAIF_TX_PATH][ec->reg] == >>> value) >>> + return 0; >>> + >>> admaif->mono_to_stereo[ADMAIF_TX_PATH][ec->reg] = value; >>> - else if (strstr(kcontrol->id.name, "Capture Mono To Stereo")) >>> + } else if (strstr(kcontrol->id.name, "Capture Mono To Stereo")) { >>> + if (admaif->mono_to_stereo[ADMAIF_RX_PATH][ec->reg] == >>> value) >>> + return 0; >>> + >>> admaif->mono_to_stereo[ADMAIF_RX_PATH][ec->reg] = value; >>> - else if (strstr(kcontrol->id.name, "Playback Stereo To Mono")) >>> + } else if (strstr(kcontrol->id.name, "Playback Stereo To Mono")) { >>> + if (admaif->stereo_to_mono[ADMAIF_TX_PATH][ec->reg] == >>> value) >>> + return 0; >>> + >>> admaif->stereo_to_mono[ADMAIF_TX_PATH][ec->reg] = value; >>> - else if (strstr(kcontrol->id.name, "Capture Stereo To Mono")) >>> + } else if (strstr(kcontrol->id.name, "Capture Stereo To Mono")) { >>> + if (admaif->stereo_to_mono[ADMAIF_RX_PATH][ec->reg] == >>> value) >>> + return 0; >>> + >>> admaif->stereo_to_mono[ADMAIF_RX_PATH][ec->reg] = value; >>> + } >>> >>> - return 0; >>> + return 1; >> >> Hrm, that looks too redundant. The similar checks are seen in the get >> part, so we may have a better helper function to reduce the string >> checks, something like below. > Thanks Takashi for your inputs. This would make the get/put callbacks simpler. But in some cases, for few controls additional handling is required (tegra210_i2s.c driver for example). In such cases additional checks would be required if the callback is common. > While proposing such cleanups, I would create separate get/put > callbacks for > all four ops instead using strstr(). The callbacks may put the common > code to > one function. It may reduce the code size (and the text segment size). With separate callbacks, the string checks can be removed. However for most of the controls, the common part is minimal. So there would be multiple independent small functions depending on the number of controls and the local variables are duplicated that many times. Would there be any concern on the space these local variables take? One pair of callbacks for a control may look like this. static int kctl_pget_mono_to_stereo(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct snd_soc_component *cmpnt = snd_soc_kcontrol_component(kcontrol); struct soc_enum *ec = (struct soc_enum *)kcontrol->private_value; struct tegra_admaif *admaif = snd_soc_component_get_drvdata(cmpnt); ucontrol->value.integer.value[0] = admaif->mono_to_stereo[ADMAIF_TX_PATH][ec->reg]; return 0; } static int kctl_pput_mono_to_stereo(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct snd_soc_component *cmpnt = snd_soc_kcontrol_component(kcontrol); struct soc_enum *ec = (struct soc_enum *)kcontrol->private_value; struct tegra_admaif *admaif = snd_soc_component_get_drvdata(cmpnt); int value = ucontrol->value.integer.value[0]; if (value == admaif->mono_to_stereo[ADMAIF_TX_PATH][ec->reg]) return 0; admaif->mono_to_stereo[ADMAIF_TX_PATH][ec->reg] = value; return 1; } Looks like having separate callbacks make it look more cleaner. If this appears fine, I can send next revision.
On 11/3/2021 7:46 PM, Takashi Iwai wrote: > BTW, independent from this patch set, I noticed that those get/put > callbacks handle the wrong type. For enum ctls, you have to use > ucontrol->value.enumerated.value instead of > ucontrol->value.integer.value. The former is long while the latter is > int, hence they may have different sizes. > > Such a bug could be caught if you test once with > CONFIG_SND_CTL_VALIDATION=y. It's recommended to test with that > config once for a new driver code. > > So, please submit the fix patch(es) for correcting the ctl value > types, too. Thanks for suggesting. I will include fixes for this as well in current series.
On Mon, Nov 08, 2021 at 09:33:25PM +0530, Sameer Pujar wrote: > With separate callbacks, the string checks can be removed. However for most > of the controls, the common part is minimal. So there would be multiple > independent small functions depending on the number of controls and the > local variables are duplicated that many times. Would there be any concern > on the space these local variables take? One pair of callbacks for a control > may look like this. ... > Looks like having separate callbacks make it look more cleaner. If this > appears fine, I can send next revision. Looks fine. It'll result in more code but hopefully they should be smaller, especially if you're using substrings rather than the full control name to identify the control and we need to store all them separately to the copy used to identify the control to userspace (I didn't go check).
diff --git a/sound/soc/tegra/tegra210_admaif.c b/sound/soc/tegra/tegra210_admaif.c index bcccdf3..dc71075 100644 --- a/sound/soc/tegra/tegra210_admaif.c +++ b/sound/soc/tegra/tegra210_admaif.c @@ -452,16 +452,29 @@ static int tegra_admaif_put_control(struct snd_kcontrol *kcontrol, struct tegra_admaif *admaif = snd_soc_component_get_drvdata(cmpnt); int value = ucontrol->value.integer.value[0]; - if (strstr(kcontrol->id.name, "Playback Mono To Stereo")) + if (strstr(kcontrol->id.name, "Playback Mono To Stereo")) { + if (admaif->mono_to_stereo[ADMAIF_TX_PATH][ec->reg] == value) + return 0; + admaif->mono_to_stereo[ADMAIF_TX_PATH][ec->reg] = value; - else if (strstr(kcontrol->id.name, "Capture Mono To Stereo")) + } else if (strstr(kcontrol->id.name, "Capture Mono To Stereo")) { + if (admaif->mono_to_stereo[ADMAIF_RX_PATH][ec->reg] == value) + return 0; + admaif->mono_to_stereo[ADMAIF_RX_PATH][ec->reg] = value; - else if (strstr(kcontrol->id.name, "Playback Stereo To Mono")) + } else if (strstr(kcontrol->id.name, "Playback Stereo To Mono")) { + if (admaif->stereo_to_mono[ADMAIF_TX_PATH][ec->reg] == value) + return 0; + admaif->stereo_to_mono[ADMAIF_TX_PATH][ec->reg] = value; - else if (strstr(kcontrol->id.name, "Capture Stereo To Mono")) + } else if (strstr(kcontrol->id.name, "Capture Stereo To Mono")) { + if (admaif->stereo_to_mono[ADMAIF_RX_PATH][ec->reg] == value) + return 0; + admaif->stereo_to_mono[ADMAIF_RX_PATH][ec->reg] = value; + } - return 0; + return 1; } static int tegra_admaif_dai_probe(struct snd_soc_dai *dai)
The kcontrol put callback is expected to return 1 when there is change in HW or when the update is acknowledged by driver. This would ensure that change notifications are sent to subscribed applications. Update the ADMAIF driver accordingly Fixes: f74028e159bb ("ASoC: tegra: Add Tegra210 based ADMAIF driver") Suggested-by: Jaroslav Kysela <perex@perex.cz> Suggested-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sameer Pujar <spujar@nvidia.com> --- sound/soc/tegra/tegra210_admaif.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)