提交 7bd3a6f3 编写于 作者: M Mark Brown

ASoC: dapm: Supply the DAI and substream when calling stream events

In order to allow us to do something smarter than iterate through widgets
doing strcmp() to work out what to power up for stream events change the
interface used to generate them to be based on the combination of a DAI
and a stream direction rather than just a simple string identifying the
stream.

At some point we'll probably want a set of channels too.
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>
上级 5ba06fc9
...@@ -365,8 +365,8 @@ int snd_soc_dapm_weak_routes(struct snd_soc_dapm_context *dapm, ...@@ -365,8 +365,8 @@ int snd_soc_dapm_weak_routes(struct snd_soc_dapm_context *dapm,
const struct snd_soc_dapm_route *route, int num); const struct snd_soc_dapm_route *route, int num);
/* dapm events */ /* dapm events */
int snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream,
const char *stream, int event); struct snd_soc_dai *dai, int event);
void snd_soc_dapm_shutdown(struct snd_soc_card *card); void snd_soc_dapm_shutdown(struct snd_soc_card *card);
/* external DAPM widget events */ /* external DAPM widget events */
......
...@@ -573,18 +573,20 @@ int snd_soc_suspend(struct device *dev) ...@@ -573,18 +573,20 @@ int snd_soc_suspend(struct device *dev)
} }
for (i = 0; i < card->num_rtd; i++) { for (i = 0; i < card->num_rtd; i++) {
struct snd_soc_dai_driver *driver = card->rtd[i].codec_dai->driver; struct snd_soc_dai *codec_dai = card->rtd[i].codec_dai;
if (card->rtd[i].dai_link->ignore_suspend) if (card->rtd[i].dai_link->ignore_suspend)
continue; continue;
if (driver->playback.stream_name != NULL) snd_soc_dapm_stream_event(&card->rtd[i],
snd_soc_dapm_stream_event(&card->rtd[i], driver->playback.stream_name, SNDRV_PCM_STREAM_PLAYBACK,
SND_SOC_DAPM_STREAM_SUSPEND); codec_dai,
SND_SOC_DAPM_STREAM_SUSPEND);
if (driver->capture.stream_name != NULL) snd_soc_dapm_stream_event(&card->rtd[i],
snd_soc_dapm_stream_event(&card->rtd[i], driver->capture.stream_name, SNDRV_PCM_STREAM_CAPTURE,
SND_SOC_DAPM_STREAM_SUSPEND); codec_dai,
SND_SOC_DAPM_STREAM_SUSPEND);
} }
/* suspend all CODECs */ /* suspend all CODECs */
...@@ -687,18 +689,18 @@ static void soc_resume_deferred(struct work_struct *work) ...@@ -687,18 +689,18 @@ static void soc_resume_deferred(struct work_struct *work)
} }
for (i = 0; i < card->num_rtd; i++) { for (i = 0; i < card->num_rtd; i++) {
struct snd_soc_dai_driver *driver = card->rtd[i].codec_dai->driver; struct snd_soc_dai *codec_dai = card->rtd[i].codec_dai;
if (card->rtd[i].dai_link->ignore_suspend) if (card->rtd[i].dai_link->ignore_suspend)
continue; continue;
if (driver->playback.stream_name != NULL) snd_soc_dapm_stream_event(&card->rtd[i],
snd_soc_dapm_stream_event(&card->rtd[i], driver->playback.stream_name, SNDRV_PCM_STREAM_PLAYBACK, codec_dai,
SND_SOC_DAPM_STREAM_RESUME); SND_SOC_DAPM_STREAM_RESUME);
if (driver->capture.stream_name != NULL) snd_soc_dapm_stream_event(&card->rtd[i],
snd_soc_dapm_stream_event(&card->rtd[i], driver->capture.stream_name, SNDRV_PCM_STREAM_CAPTURE, codec_dai,
SND_SOC_DAPM_STREAM_RESUME); SND_SOC_DAPM_STREAM_RESUME);
} }
/* unmute any active DACs */ /* unmute any active DACs */
......
...@@ -2823,17 +2823,27 @@ int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm, ...@@ -2823,17 +2823,27 @@ int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm,
EXPORT_SYMBOL_GPL(snd_soc_dapm_new_controls); EXPORT_SYMBOL_GPL(snd_soc_dapm_new_controls);
static void soc_dapm_stream_event(struct snd_soc_dapm_context *dapm, static void soc_dapm_stream_event(struct snd_soc_dapm_context *dapm,
const char *stream, int event) int stream, struct snd_soc_dai *dai,
int event)
{ {
struct snd_soc_dapm_widget *w; struct snd_soc_dapm_widget *w;
const char *stream_name;
if (stream == SNDRV_PCM_STREAM_PLAYBACK)
stream_name = dai->driver->playback.stream_name;
else
stream_name = dai->driver->capture.stream_name;
if (!stream_name)
return;
list_for_each_entry(w, &dapm->card->widgets, list) list_for_each_entry(w, &dapm->card->widgets, list)
{ {
if (!w->sname || w->dapm != dapm) if (!w->sname || w->dapm != dapm)
continue; continue;
dev_vdbg(w->dapm->dev, "widget %s\n %s stream %s event %d\n", dev_vdbg(w->dapm->dev, "widget %s\n %s stream %s event %d\n",
w->name, w->sname, stream, event); w->name, w->sname, stream_name, event);
if (strstr(w->sname, stream)) { if (strstr(w->sname, stream_name)) {
dapm_mark_dirty(w, "stream event"); dapm_mark_dirty(w, "stream event");
switch(event) { switch(event) {
case SND_SOC_DAPM_STREAM_START: case SND_SOC_DAPM_STREAM_START:
...@@ -2865,16 +2875,13 @@ static void soc_dapm_stream_event(struct snd_soc_dapm_context *dapm, ...@@ -2865,16 +2875,13 @@ static void soc_dapm_stream_event(struct snd_soc_dapm_context *dapm,
* *
* Returns 0 for success else error. * Returns 0 for success else error.
*/ */
int snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream,
const char *stream, int event) struct snd_soc_dai *dai, int event)
{ {
struct snd_soc_codec *codec = rtd->codec; struct snd_soc_codec *codec = rtd->codec;
if (stream == NULL)
return 0;
mutex_lock(&codec->mutex); mutex_lock(&codec->mutex);
soc_dapm_stream_event(&codec->dapm, stream, event); soc_dapm_stream_event(&codec->dapm, stream, dai, event);
mutex_unlock(&codec->mutex); mutex_unlock(&codec->mutex);
return 0; return 0;
} }
......
...@@ -307,9 +307,8 @@ static void close_delayed_work(struct work_struct *work) ...@@ -307,9 +307,8 @@ static void close_delayed_work(struct work_struct *work)
/* are we waiting on this codec DAI stream */ /* are we waiting on this codec DAI stream */
if (codec_dai->pop_wait == 1) { if (codec_dai->pop_wait == 1) {
codec_dai->pop_wait = 0; codec_dai->pop_wait = 0;
snd_soc_dapm_stream_event(rtd, snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK,
codec_dai->driver->playback.stream_name, codec_dai, SND_SOC_DAPM_STREAM_STOP);
SND_SOC_DAPM_STREAM_STOP);
} }
mutex_unlock(&rtd->pcm_mutex); mutex_unlock(&rtd->pcm_mutex);
...@@ -373,8 +372,9 @@ static int soc_pcm_close(struct snd_pcm_substream *substream) ...@@ -373,8 +372,9 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
rtd->dai_link->ignore_pmdown_time) { rtd->dai_link->ignore_pmdown_time) {
/* powered down playback stream now */ /* powered down playback stream now */
snd_soc_dapm_stream_event(rtd, snd_soc_dapm_stream_event(rtd,
codec_dai->driver->playback.stream_name, SNDRV_PCM_STREAM_PLAYBACK,
SND_SOC_DAPM_STREAM_STOP); codec_dai,
SND_SOC_DAPM_STREAM_STOP);
} else { } else {
/* start delayed pop wq here for playback streams */ /* start delayed pop wq here for playback streams */
codec_dai->pop_wait = 1; codec_dai->pop_wait = 1;
...@@ -383,9 +383,8 @@ static int soc_pcm_close(struct snd_pcm_substream *substream) ...@@ -383,9 +383,8 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
} }
} else { } else {
/* capture streams can be powered down now */ /* capture streams can be powered down now */
snd_soc_dapm_stream_event(rtd, snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_CAPTURE,
codec_dai->driver->capture.stream_name, codec_dai, SND_SOC_DAPM_STREAM_STOP);
SND_SOC_DAPM_STREAM_STOP);
} }
mutex_unlock(&rtd->pcm_mutex); mutex_unlock(&rtd->pcm_mutex);
...@@ -454,14 +453,8 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream) ...@@ -454,14 +453,8 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)
cancel_delayed_work(&rtd->delayed_work); cancel_delayed_work(&rtd->delayed_work);
} }
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) snd_soc_dapm_stream_event(rtd, substream->stream, codec_dai,
snd_soc_dapm_stream_event(rtd, SND_SOC_DAPM_STREAM_START);
codec_dai->driver->playback.stream_name,
SND_SOC_DAPM_STREAM_START);
else
snd_soc_dapm_stream_event(rtd,
codec_dai->driver->capture.stream_name,
SND_SOC_DAPM_STREAM_START);
snd_soc_dai_digital_mute(codec_dai, 0); snd_soc_dai_digital_mute(codec_dai, 0);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册