samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: ops: Enforce platform maximum on initial value

Browse Source 
[ Upstream commit 783db6851c1821d8b983ffb12b99c279ff64f2ee ]

Lower the volume if it is violating the platform maximum at its initial
value (i.e. at the time of the 'snd_soc_limit_volume' call).

Signed-off-by: Martin Povišer <povik+lin@cutebit.org>
[Cherry picked from the Asahi kernel with fixups -- broonie]
Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://patch.msgid.link/20250208-asoc-volume-limit-v1-1-b98fcf4cdbad@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Martin Povišer
2025-02-08 00:57:22 +00:00
committed by Greg Kroah-Hartman
parent 3da8088afd
commit 9dcce3f40d
1 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
sound/soc/soc-ops.c
View File

@@ -638,6 +638,33 @@ int snd_soc_get_volsw_range(struct snd_kcontrol *kcontrol,
} }
EXPORT_SYMBOL_GPL(snd_soc_get_volsw_range); EXPORT_SYMBOL_GPL(snd_soc_get_volsw_range);
static int snd_soc_clip_to_platform_max(struct snd_kcontrol *kctl)
{
struct soc_mixer_control *mc = (struct soc_mixer_control *)kctl->private_value;
struct snd_ctl_elem_value uctl;
int ret;
if (!mc->platform_max)
return 0;
ret = kctl->get(kctl, &uctl);
if (ret < 0)
return ret;
if (uctl.value.integer.value[0] > mc->platform_max)
uctl.value.integer.value[0] = mc->platform_max;
if (snd_soc_volsw_is_stereo(mc) &&
uctl.value.integer.value[1] > mc->platform_max)
uctl.value.integer.value[1] = mc->platform_max;
ret = kctl->put(kctl, &uctl);
if (ret < 0)
return ret;
return 0;
}
/** /**
* snd_soc_limit_volume - Set new limit to an existing volume control. * snd_soc_limit_volume - Set new limit to an existing volume control.
* *
@@ -662,7 +689,7 @@ int snd_soc_limit_volume(struct snd_soc_card *card,
struct soc_mixer_control *mc = (struct soc_mixer_control *)kctl->private_value; struct soc_mixer_control *mc = (struct soc_mixer_control *)kctl->private_value;
if (max <= mc->max - mc->min) { if (max <= mc->max - mc->min) {
mc->platform_max = max; mc->platform_max = max;
ret = 0; ret = snd_soc_clip_to_platform_max(kctl);
} }
} }
return ret; return ret;