| Message ID | 20200309170749.32313-4-guennadi.liakhovetski@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ASoC: SOF: preparatory patches | expand |
On 3/9/20 12:07 PM, Guennadi Liakhovetski wrote: > This makes DPCM runtime update functions available for external > calling. As an example, virtualised ASoC component drivers may need > to call these when managing shared DAPM routes that are used by more > than one driver (i.e. when host driver and guest drivers have a DAPM > path from guest PCM to host DAI where some parts are owned by host > driver and others by guest driver). Exporting the functions for uses by vhost drivers looks fine, but your 'as an example' prose is rather confusing. It's not really that the vhost drivers 'may' use these functions but rather that they *shall* do so so that guest-initiated events are propagated into the host-managed graph which handles 'physical' widgets and DAIs. Or did I completely miss the idea? > > Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com> > --- > include/sound/soc-dpcm.h | 6 +++--- > sound/soc/soc-dapm.c | 8 ++++---- > sound/soc/soc-pcm.c | 7 +++++-- > 3 files changed, 12 insertions(+), 9 deletions(-) > > diff --git a/include/sound/soc-dpcm.h b/include/sound/soc-dpcm.h > index aa56118..b961c06 100644 > --- a/include/sound/soc-dpcm.h > +++ b/include/sound/soc-dpcm.h > @@ -149,9 +149,9 @@ int snd_soc_dpcm_be_can_update(struct snd_soc_pcm_runtime *fe, > struct snd_pcm_substream * > snd_soc_dpcm_get_substream(struct snd_soc_pcm_runtime *be, int stream); > > -/* internal use only */ > -int soc_dpcm_runtime_update(struct snd_soc_card *card, > - enum snd_soc_dpcm_update_mode mode); > +/* update audio routing between PCMs and any DAI links */ > +int snd_soc_dpcm_runtime_update(struct snd_soc_card *card, > + enum snd_soc_dpcm_update_mode mode); > > #ifdef CONFIG_DEBUG_FS > void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd); > diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c > index f496c53..3b91d7c 100644 > --- a/sound/soc/soc-dapm.c > +++ b/sound/soc/soc-dapm.c > @@ -2292,7 +2292,7 @@ int snd_soc_dapm_mux_update_power(struct snd_soc_dapm_context *dapm, > card->update = NULL; > mutex_unlock(&card->dapm_mutex); > if (ret > 0) > - soc_dpcm_runtime_update(card, SND_SOC_DPCM_UPDATE_FULL); > + snd_soc_dpcm_runtime_update(card, SND_SOC_DPCM_UPDATE_FULL); > return ret; > } > EXPORT_SYMBOL_GPL(snd_soc_dapm_mux_update_power); > @@ -2357,7 +2357,7 @@ int snd_soc_dapm_mixer_update_power(struct snd_soc_dapm_context *dapm, > card->update = NULL; > mutex_unlock(&card->dapm_mutex); > if (ret > 0) > - soc_dpcm_runtime_update(card, SND_SOC_DPCM_UPDATE_FULL); > + snd_soc_dpcm_runtime_update(card, SND_SOC_DPCM_UPDATE_FULL); > return ret; > } > EXPORT_SYMBOL_GPL(snd_soc_dapm_mixer_update_power); > @@ -3397,7 +3397,7 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, > mutex_unlock(&card->dapm_mutex); > > if (ret > 0) > - soc_dpcm_runtime_update(card, SND_SOC_DPCM_UPDATE_FULL); > + snd_soc_dpcm_runtime_update(card, SND_SOC_DPCM_UPDATE_FULL); > > return change; > } > @@ -3502,7 +3502,7 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol, > mutex_unlock(&card->dapm_mutex); > > if (ret > 0) > - soc_dpcm_runtime_update(card, SND_SOC_DPCM_UPDATE_FULL); > + snd_soc_dpcm_runtime_update(card, SND_SOC_DPCM_UPDATE_FULL); > > return change; > } > diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c > index 5b3bc3f..d373148 100644 > --- a/sound/soc/soc-pcm.c > +++ b/sound/soc/soc-pcm.c > @@ -295,6 +295,7 @@ void snd_soc_runtime_activate(struct snd_soc_pcm_runtime *rtd, int stream) > { > snd_soc_runtime_action(rtd, stream, 1); > } > +EXPORT_SYMBOL_GPL(snd_soc_runtime_activate); > > /** > * snd_soc_runtime_deactivate() - Decrement active count for PCM runtime components > @@ -310,6 +311,7 @@ void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream) > { > snd_soc_runtime_action(rtd, stream, -1); > } > +EXPORT_SYMBOL_GPL(snd_soc_runtime_deactivate); > > /** > * snd_soc_runtime_ignore_pmdown_time() - Check whether to ignore the power down delay > @@ -2974,8 +2976,8 @@ static int soc_dpcm_fe_runtime_update(struct snd_soc_pcm_runtime *fe, bool new, > /* Called by DAPM mixer/mux changes to update audio routing between PCMs and > * any DAI links. > */ > -int soc_dpcm_runtime_update(struct snd_soc_card *card, > - enum snd_soc_dpcm_update_mode mode) > +int snd_soc_dpcm_runtime_update(struct snd_soc_card *card, > + enum snd_soc_dpcm_update_mode mode) > { > struct snd_soc_pcm_runtime *fe; > int ret = 0; > @@ -3019,6 +3021,7 @@ int soc_dpcm_runtime_update(struct snd_soc_card *card, > mutex_unlock(&card->mutex); > return ret; > } > +EXPORT_SYMBOL_GPL(snd_soc_dpcm_runtime_update); > > static void dpcm_fe_dai_cleanup(struct snd_pcm_substream *fe_substream) > { >
diff --git a/include/sound/soc-dpcm.h b/include/sound/soc-dpcm.h index aa56118..b961c06 100644 --- a/include/sound/soc-dpcm.h +++ b/include/sound/soc-dpcm.h @@ -149,9 +149,9 @@ int snd_soc_dpcm_be_can_update(struct snd_soc_pcm_runtime *fe, struct snd_pcm_substream * snd_soc_dpcm_get_substream(struct snd_soc_pcm_runtime *be, int stream); -/* internal use only */ -int soc_dpcm_runtime_update(struct snd_soc_card *card, - enum snd_soc_dpcm_update_mode mode); +/* update audio routing between PCMs and any DAI links */ +int snd_soc_dpcm_runtime_update(struct snd_soc_card *card, + enum snd_soc_dpcm_update_mode mode); #ifdef CONFIG_DEBUG_FS void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd); diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index f496c53..3b91d7c 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -2292,7 +2292,7 @@ int snd_soc_dapm_mux_update_power(struct snd_soc_dapm_context *dapm, card->update = NULL; mutex_unlock(&card->dapm_mutex); if (ret > 0) - soc_dpcm_runtime_update(card, SND_SOC_DPCM_UPDATE_FULL); + snd_soc_dpcm_runtime_update(card, SND_SOC_DPCM_UPDATE_FULL); return ret; } EXPORT_SYMBOL_GPL(snd_soc_dapm_mux_update_power); @@ -2357,7 +2357,7 @@ int snd_soc_dapm_mixer_update_power(struct snd_soc_dapm_context *dapm, card->update = NULL; mutex_unlock(&card->dapm_mutex); if (ret > 0) - soc_dpcm_runtime_update(card, SND_SOC_DPCM_UPDATE_FULL); + snd_soc_dpcm_runtime_update(card, SND_SOC_DPCM_UPDATE_FULL); return ret; } EXPORT_SYMBOL_GPL(snd_soc_dapm_mixer_update_power); @@ -3397,7 +3397,7 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, mutex_unlock(&card->dapm_mutex); if (ret > 0) - soc_dpcm_runtime_update(card, SND_SOC_DPCM_UPDATE_FULL); + snd_soc_dpcm_runtime_update(card, SND_SOC_DPCM_UPDATE_FULL); return change; } @@ -3502,7 +3502,7 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol, mutex_unlock(&card->dapm_mutex); if (ret > 0) - soc_dpcm_runtime_update(card, SND_SOC_DPCM_UPDATE_FULL); + snd_soc_dpcm_runtime_update(card, SND_SOC_DPCM_UPDATE_FULL); return change; } diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 5b3bc3f..d373148 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -295,6 +295,7 @@ void snd_soc_runtime_activate(struct snd_soc_pcm_runtime *rtd, int stream) { snd_soc_runtime_action(rtd, stream, 1); } +EXPORT_SYMBOL_GPL(snd_soc_runtime_activate); /** * snd_soc_runtime_deactivate() - Decrement active count for PCM runtime components @@ -310,6 +311,7 @@ void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream) { snd_soc_runtime_action(rtd, stream, -1); } +EXPORT_SYMBOL_GPL(snd_soc_runtime_deactivate); /** * snd_soc_runtime_ignore_pmdown_time() - Check whether to ignore the power down delay @@ -2974,8 +2976,8 @@ static int soc_dpcm_fe_runtime_update(struct snd_soc_pcm_runtime *fe, bool new, /* Called by DAPM mixer/mux changes to update audio routing between PCMs and * any DAI links. */ -int soc_dpcm_runtime_update(struct snd_soc_card *card, - enum snd_soc_dpcm_update_mode mode) +int snd_soc_dpcm_runtime_update(struct snd_soc_card *card, + enum snd_soc_dpcm_update_mode mode) { struct snd_soc_pcm_runtime *fe; int ret = 0; @@ -3019,6 +3021,7 @@ int soc_dpcm_runtime_update(struct snd_soc_card *card, mutex_unlock(&card->mutex); return ret; } +EXPORT_SYMBOL_GPL(snd_soc_dpcm_runtime_update); static void dpcm_fe_dai_cleanup(struct snd_pcm_substream *fe_substream) {
This makes DPCM runtime update functions available for external calling. As an example, virtualised ASoC component drivers may need to call these when managing shared DAPM routes that are used by more than one driver (i.e. when host driver and guest drivers have a DAPM path from guest PCM to host DAI where some parts are owned by host driver and others by guest driver). Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com> --- include/sound/soc-dpcm.h | 6 +++--- sound/soc/soc-dapm.c | 8 ++++---- sound/soc/soc-pcm.c | 7 +++++-- 3 files changed, 12 insertions(+), 9 deletions(-)