Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: dapm: don't call pm_runtime_* on card device

runtime_usage of sound card has been observed to grow without bound.
For example:
$ cat /sys/devices/platform/sound/power/runtime_usage
46
$ sox -n -t s16 -r 48000 -c 2 - synth 1 sine 440 vol 0.1 | \
aplay -q -D hw:0,0 -f S16_LE -r 48000 -c 2
$ cat /sys/devices/platform/sound/power/runtime_usage
52

Commit 4e872a46823c ("ASoC: dapm: Don't force card bias level to be
updated") stops to force update bias_level on card. If card doesn't
provide set_bias_level callback, the snd_soc_dapm_set_bias_level()
is equivalent to NOP for card device.

As a result, dapm_pre_sequence_async() doesn't change the bias_level of
card device correctly. Thus, pm_runtime_get_sync() would be called in
dapm_pre_sequence_async() without symmetric pm_runtime_put() in
dapm_post_sequence_async().

Don't call pm_runtime_* on card device.

Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
Link: https://lore.kernel.org/r/20200724070731.451377-1-tzungbi@google.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Tzung-Bi Shih and committed by
Mark Brown
3aecfc72 aa2d1ee7

+2 -2
+2 -2
sound/soc/soc-dapm.c
··· 1798 1798 /* If we're off and we're not supposed to go into STANDBY */ 1799 1799 if (d->bias_level == SND_SOC_BIAS_OFF && 1800 1800 d->target_bias_level != SND_SOC_BIAS_OFF) { 1801 - if (d->dev) 1801 + if (d->dev && cookie) 1802 1802 pm_runtime_get_sync(d->dev); 1803 1803 1804 1804 ret = snd_soc_dapm_set_bias_level(d, SND_SOC_BIAS_STANDBY); ··· 1845 1845 dev_err(d->dev, "ASoC: Failed to turn off bias: %d\n", 1846 1846 ret); 1847 1847 1848 - if (d->dev) 1848 + if (d->dev && cookie) 1849 1849 pm_runtime_put(d->dev); 1850 1850 } 1851 1851