aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-18 11:14:44 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-19 08:02:32 -0500
commit474b62d6eee733abdcd36f8e3e5ce504fbb9110b (patch)
tree1b399ebd627111f806fe7a20daa9f3df87ff567a /sound
parent20e4859dedfc7e7b620d1756b29f8483c5be5fcc (diff)
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: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-core.c1
-rw-r--r--sound/soc/soc-dapm.c16
2 files changed, 16 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 9e68984423b2..b0e7689159c1 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3496,6 +3496,7 @@ int snd_soc_register_codec(struct device *dev,
3496 codec->dapm.bias_level = SND_SOC_BIAS_OFF; 3496 codec->dapm.bias_level = SND_SOC_BIAS_OFF;
3497 codec->dapm.dev = dev; 3497 codec->dapm.dev = dev;
3498 codec->dapm.codec = codec; 3498 codec->dapm.codec = codec;
3499 codec->dapm.seq_notifier = codec_drv->seq_notifier;
3499 codec->dev = dev; 3500 codec->dev = dev;
3500 codec->driver = codec_drv; 3501 codec->driver = codec_drv;
3501 codec->num_dai = num_dai; 3502 codec->num_dai = num_dai;
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index eb7436c7acad..37b376f4c75d 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -878,7 +878,7 @@ static void dapm_seq_run(struct snd_soc_dapm_context *dapm,
878 int cur_subseq = -1; 878 int cur_subseq = -1;
879 int cur_reg = SND_SOC_NOPM; 879 int cur_reg = SND_SOC_NOPM;
880 struct snd_soc_dapm_context *cur_dapm = NULL; 880 struct snd_soc_dapm_context *cur_dapm = NULL;
881 int ret; 881 int ret, i;
882 int *sort; 882 int *sort;
883 883
884 if (power_up) 884 if (power_up)
@@ -895,6 +895,13 @@ static void dapm_seq_run(struct snd_soc_dapm_context *dapm,
895 if (!list_empty(&pending)) 895 if (!list_empty(&pending))
896 dapm_seq_run_coalesced(cur_dapm, &pending); 896 dapm_seq_run_coalesced(cur_dapm, &pending);
897 897
898 if (cur_dapm && cur_dapm->seq_notifier) {
899 for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++)
900 if (sort[i] == cur_sort)
901 cur_dapm->seq_notifier(cur_dapm,
902 i);
903 }
904
898 INIT_LIST_HEAD(&pending); 905 INIT_LIST_HEAD(&pending);
899 cur_sort = -1; 906 cur_sort = -1;
900 cur_subseq = -1; 907 cur_subseq = -1;
@@ -956,6 +963,13 @@ static void dapm_seq_run(struct snd_soc_dapm_context *dapm,
956 963
957 if (!list_empty(&pending)) 964 if (!list_empty(&pending))
958 dapm_seq_run_coalesced(dapm, &pending); 965 dapm_seq_run_coalesced(dapm, &pending);
966
967 if (cur_dapm && cur_dapm->seq_notifier) {
968 for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++)
969 if (sort[i] == cur_sort)
970 cur_dapm->seq_notifier(cur_dapm,
971 i);
972 }
959} 973}
960 974
961static void dapm_widget_update(struct snd_soc_dapm_context *dapm) 975static void dapm_widget_update(struct snd_soc_dapm_context *dapm)