diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-09-29 10:08:36 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-09-30 13:55:18 +0200 |
| commit | 4e7cf1fbb34ecb472c073980458cbe413afd4d64 (patch) | |
| tree | 058c5de079f8c9a3e2e1619c6550740d4b59508c /sound/usb/pcm.c | |
| parent | ALSA: hda: Use position buffer for SKL+ again (diff) | |
| download | linux-4e7cf1fbb34ecb472c073980458cbe413afd4d64.tar.xz linux-4e7cf1fbb34ecb472c073980458cbe413afd4d64.zip | |
ALSA: usb-audio: Restrict rates for the shared clocks
When a single clock source is shared among several endpoints, we have
to keep the same rate on all active endpoints as long as the clock is
being used. For dealing with such a case, this patch adds one more
check in the hw params constraint for the rate to take the shared
clocks into account. The current rate is evaluated from the endpoint
list that applies the same clock source.
BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1190418
Link: https://lore.kernel.org/r/20210929080844.11583-2-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to '')
| -rw-r--r-- | sound/usb/pcm.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 5dc9266180e3..19392117de9e 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -734,6 +734,7 @@ static int hw_rule_rate(struct snd_pcm_hw_params *params, struct snd_pcm_hw_rule *rule) { struct snd_usb_substream *subs = rule->private; + struct snd_usb_audio *chip = subs->stream->chip; const struct audioformat *fp; struct snd_interval *it = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE); unsigned int rmin, rmax, r; @@ -745,6 +746,14 @@ static int hw_rule_rate(struct snd_pcm_hw_params *params, list_for_each_entry(fp, &subs->fmt_list, list) { if (!hw_check_valid_format(subs, params, fp)) continue; + r = snd_usb_endpoint_get_clock_rate(chip, fp->clock); + if (r > 0) { + if (!snd_interval_test(it, r)) + continue; + rmin = min(rmin, r); + rmax = max(rmax, r); + continue; + } if (fp->rate_table && fp->nr_rates) { for (i = 0; i < fp->nr_rates; i++) { r = fp->rate_table[i]; |