lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: Provide per widget type callback when executing DAPM sequences

Browse Source 
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>
This commit is contained in:
Mark Brown
2011-01-18 16:14:44 +00:00
parent 20e4859ded
commit 474b62d6ee
4 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/sound/soc-dapm.h
View File

@@ -500,6 +500,9 @@ struct snd_soc_dapm_context {
struct snd_soc_dapm_update *update; 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 device *dev; /* from parent - for debug */
struct snd_soc_codec *codec; /* parent codec */ struct snd_soc_codec *codec; /* parent codec */
struct snd_soc_card *card; /* parent card */ struct snd_soc_card *card; /* parent card */

3
include/sound/soc.h
View File

@@ -546,6 +546,9 @@ struct snd_soc_codec_driver {
/* codec bias level */ /* codec bias level */
int (*set_bias_level)(struct snd_soc_codec *, int (*set_bias_level)(struct snd_soc_codec *,
enum snd_soc_bias_level level); enum snd_soc_bias_level level);
void (*seq_notifier)(struct snd_soc_dapm_context *,
enum snd_soc_dapm_type);
}; };
/* SoC platform interface */ /* SoC platform interface */

1
sound/soc/soc-core.c
View File

@@ -3496,6 +3496,7 @@ int snd_soc_register_codec(struct device *dev,
codec->dapm.bias_level = SND_SOC_BIAS_OFF; codec->dapm.bias_level = SND_SOC_BIAS_OFF;
codec->dapm.dev = dev; codec->dapm.dev = dev;
codec->dapm.codec = codec; codec->dapm.codec = codec;
codec->dapm.seq_notifier = codec_drv->seq_notifier;
codec->dev = dev; codec->dev = dev;
codec->driver = codec_drv; codec->driver = codec_drv;
codec->num_dai = num_dai; codec->num_dai = num_dai;

16
sound/soc/soc-dapm.c
View File

@@ -878,7 +878,7 @@ static void dapm_seq_run(struct snd_soc_dapm_context *dapm,
int cur_subseq = -1; int cur_subseq = -1;
int cur_reg = SND_SOC_NOPM; int cur_reg = SND_SOC_NOPM;
struct snd_soc_dapm_context *cur_dapm = NULL; struct snd_soc_dapm_context *cur_dapm = NULL;
int ret; int ret, i;
int *sort; int *sort;
if (power_up) if (power_up)
@@ -895,6 +895,13 @@ static void dapm_seq_run(struct snd_soc_dapm_context *dapm,
if (!list_empty(&pending)) if (!list_empty(&pending))
dapm_seq_run_coalesced(cur_dapm, &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); INIT_LIST_HEAD(&pending);
cur_sort = -1; cur_sort = -1;
cur_subseq = -1; cur_subseq = -1;
@@ -956,6 +963,13 @@ static void dapm_seq_run(struct snd_soc_dapm_context *dapm,
if (!list_empty(&pending)) if (!list_empty(&pending))
dapm_seq_run_coalesced(dapm, &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) static void dapm_widget_update(struct snd_soc_dapm_context *dapm)