| Message ID | 87tux0fujp.wl-kuninori.morimoto.gx@renesas.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ASoC: soc-core: move snd_soc_dai_link_set_capabilities() to soc-core.c | expand |
Hi Mark > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > commit 25612477d20b52 ("ASoC: soc-dai: set dai_link dpcm_ flags with a helper") > added snd_soc_dai_link_set_capabilities(). > But it is using snd_soc_find_dai() (A) which is required client_mutex (B). > And client_mutex is soc-core.c local. (snip) > Because not only snd_soc_dai_link_set_capabilities() but many drivers > are already using snd_soc_find_dai(), > 1st idea for this issue was creating snd_soc_find_dai() of > _with_mutex / _without_mutex, but it was not enough and/or confusable. > > soc-dai.c which is implemented snd_soc_dai_link_set_capabilities() currently is > mainly for snd_soc_dai related functions, not for snd_soc_dai_link. > Thus as 2nd idea, this patch moves snd_soc_dai_link_set_capabilities() > from soc-dai.c to soc-core.c, and use mutex_lock(). > > Fixes: 25612477d20b52 ("ASoC: soc-dai: set dai_link dpcm_ flags with a helper") > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > --- This is for mark/for-5.9, but I noticed that your for-5.9 branch doesn't have this commit 4f8721542f7b75954bfad98c51aa59d683d35b50 ("ASoC: core: use less strict tests for dailink capabilities") But, linus/master (= v5.9-rc2) has it. And I noticed that your for-5.10 branch has it. Which branch should I use for linus/master (= v5.9-rcX) ? Thank you for your help !! Best regards --- Kuninori Morimoto
On Tue, Aug 25, 2020 at 09:15:51AM +0900, Kuninori Morimoto wrote: > > This is for mark/for-5.9, but I noticed that > your for-5.9 branch doesn't have this commit > 4f8721542f7b75954bfad98c51aa59d683d35b50 > ("ASoC: core: use less strict tests for dailink capabilities") > But, linus/master (= v5.9-rc2) has it. > And I noticed that your for-5.10 branch has it. > Which branch should I use for linus/master (= v5.9-rcX) ? It doesn't apply on my for-5.9 branch which has v5.9-rc2 merged into it (which was needed anyway) either so could you please rebase against current for-5.9?
Hi Mark > > This is for mark/for-5.9, but I noticed that > > your for-5.9 branch doesn't have this commit > > > 4f8721542f7b75954bfad98c51aa59d683d35b50 > > ("ASoC: core: use less strict tests for dailink capabilities") > > > But, linus/master (= v5.9-rc2) has it. > > And I noticed that your for-5.10 branch has it. > > > Which branch should I use for linus/master (= v5.9-rcX) ? > > It doesn't apply on my for-5.9 branch which has v5.9-rc2 merged into it > (which was needed anyway) either so could you please rebase against > current for-5.9? Thank you for your feedback. I will rebase and post it again, but as I and Sameer discussed, it will be different Subject. Thank you for your help !! Best regards --- Kuninori Morimoto
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index fe23e936e2d1..f46979f8d965 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -344,6 +344,47 @@ struct snd_soc_component *snd_soc_lookup_component(struct device *dev, } EXPORT_SYMBOL_GPL(snd_soc_lookup_component); +/* + * snd_soc_dai_link_set_capabilities() - set dai_link properties based on its DAIs + */ +void snd_soc_dai_link_set_capabilities(struct snd_soc_dai_link *dai_link) +{ + struct snd_soc_dai_link_component *cpu; + struct snd_soc_dai_link_component *codec; + struct snd_soc_dai *dai; + bool supported[SNDRV_PCM_STREAM_LAST + 1]; + int direction; + int i; + + mutex_lock(&client_mutex); + + for_each_pcm_streams(direction) { + supported[direction] = true; + + for_each_link_cpus(dai_link, i, cpu) { + dai = snd_soc_find_dai(cpu); + if (!dai || !snd_soc_dai_stream_valid(dai, direction)) { + supported[direction] = false; + break; + } + } + if (!supported[direction]) + continue; + for_each_link_codecs(dai_link, i, codec) { + dai = snd_soc_find_dai(codec); + if (!dai || !snd_soc_dai_stream_valid(dai, direction)) { + supported[direction] = false; + break; + } + } + } + mutex_unlock(&client_mutex); + + dai_link->dpcm_playback = supported[SNDRV_PCM_STREAM_PLAYBACK]; + dai_link->dpcm_capture = supported[SNDRV_PCM_STREAM_CAPTURE]; +} +EXPORT_SYMBOL_GPL(snd_soc_dai_link_set_capabilities); + struct snd_soc_pcm_runtime *snd_soc_get_pcm_runtime(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link) diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index 693893420bf0..783b7928205e 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -393,44 +393,6 @@ bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int dir) return stream->channels_min; } -/* - * snd_soc_dai_link_set_capabilities() - set dai_link properties based on its DAIs - */ -void snd_soc_dai_link_set_capabilities(struct snd_soc_dai_link *dai_link) -{ - struct snd_soc_dai_link_component *cpu; - struct snd_soc_dai_link_component *codec; - struct snd_soc_dai *dai; - bool supported[SNDRV_PCM_STREAM_LAST + 1]; - int direction; - int i; - - for_each_pcm_streams(direction) { - supported[direction] = true; - - for_each_link_cpus(dai_link, i, cpu) { - dai = snd_soc_find_dai(cpu); - if (!dai || !snd_soc_dai_stream_valid(dai, direction)) { - supported[direction] = false; - break; - } - } - if (!supported[direction]) - continue; - for_each_link_codecs(dai_link, i, codec) { - dai = snd_soc_find_dai(codec); - if (!dai || !snd_soc_dai_stream_valid(dai, direction)) { - supported[direction] = false; - break; - } - } - } - - dai_link->dpcm_playback = supported[SNDRV_PCM_STREAM_PLAYBACK]; - dai_link->dpcm_capture = supported[SNDRV_PCM_STREAM_CAPTURE]; -} -EXPORT_SYMBOL_GPL(snd_soc_dai_link_set_capabilities); - void snd_soc_dai_action(struct snd_soc_dai *dai, int stream, int action) {