Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 474b62d6 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Provide per widget type callback when executing DAPM sequences 



Many modern devices have features such as DC servos which take time to start.
Currently these are handled by per-widget events but this makes it difficult
to paralleise operations on multiple widgets, meaning delays can end up
being needlessly serialised. By providing a callback to drivers when all
widgets of a given type have been handled during a DAPM sequence the core
allows drivers to start operations separately and wait for them to complete
much more simply.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 20e4859d

include/sound/soc-dapm.h

+3 −0
Original line number Diff line number Diff line
@@ -500,6 +500,9 @@ struct snd_soc_dapm_context { 


	struct snd_soc_dapm_update *update;



	void (*seq_notifier)(struct snd_soc_dapm_context *,

			     enum snd_soc_dapm_type);



	struct device *dev; /* from parent - for debug */

	struct snd_soc_codec *codec; /* parent codec */

	struct snd_soc_card *card; /* parent card */

include/sound/soc.h

+3 −0
Original line number Diff line number Diff line
@@ -546,6 +546,9 @@ struct snd_soc_codec_driver { 
	/* codec bias level */

	int (*set_bias_level)(struct snd_soc_codec *,

			      enum snd_soc_bias_level level);



	void (*seq_notifier)(struct snd_soc_dapm_context *,

			     enum snd_soc_dapm_type);

};



/* SoC platform interface */

sound/soc/soc-core.c

+1 −0
Original line number Diff line number Diff line
@@ -3496,6 +3496,7 @@ int snd_soc_register_codec(struct device *dev, 
	codec->dapm.bias_level = SND_SOC_BIAS_OFF;

	codec->dapm.dev = dev;

	codec->dapm.codec = codec;

	codec->dapm.seq_notifier = codec_drv->seq_notifier;

	codec->dev = dev;

	codec->driver = codec_drv;

	codec->num_dai = num_dai;

sound/soc/soc-dapm.c

+15 −1
Original line number Diff line number Diff line
@@ -878,7 +878,7 @@ static void dapm_seq_run(struct snd_soc_dapm_context *dapm, 
	int cur_subseq = -1;

	int cur_reg = SND_SOC_NOPM;

	struct snd_soc_dapm_context *cur_dapm = NULL;

	int ret;

	int ret, i;

	int *sort;



	if (power_up)
@@ -895,6 +895,13 @@ static void dapm_seq_run(struct snd_soc_dapm_context *dapm, 
			if (!list_empty(&pending))

				dapm_seq_run_coalesced(cur_dapm, &pending);



			if (cur_dapm && cur_dapm->seq_notifier) {

				for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++)

					if (sort[i] == cur_sort)

						cur_dapm->seq_notifier(cur_dapm,

								       i);

			}



			INIT_LIST_HEAD(&pending);

			cur_sort = -1;

			cur_subseq = -1;
@@ -956,6 +963,13 @@ static void dapm_seq_run(struct snd_soc_dapm_context *dapm, 


	if (!list_empty(&pending))

		dapm_seq_run_coalesced(dapm, &pending);



	if (cur_dapm && cur_dapm->seq_notifier) {

		for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++)

			if (sort[i] == cur_sort)

				cur_dapm->seq_notifier(cur_dapm,

						       i);

	}

}



static void dapm_widget_update(struct snd_soc_dapm_context *dapm)