Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-28 07:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: codec2codec: deal with params when necessary

Browse Source 
When there is an event on codec to codec dai_link, we only need to deal
with params if the event is SND_SOC_DAPM_PRE_PMU, when .hw_params() is
called. For the other events, it is useless.

Also, dealing with the codec to codec params just before calling
.hw_params() callbacks give change to either party on the link to alter
params content in .startup(), which might be useful in some cases

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/20190725165949.29699-4-jbrunet@baylibre.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Jerome Brunet 2019-07-25 18:59:46 +02:00 committed by Mark Brown
parent 054d65004c
commit 3dcfb397da
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 92 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3764,25 +3764,59 @@ 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 int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w, static int
struct snd_kcontrol *kcontrol, int event) snd_soc_dai_link_event_pre_pmu(struct snd_soc_dapm_widget *w,
struct snd_pcm_substream *substream)
{ {
struct snd_soc_dapm_path *path; struct snd_soc_dapm_path *path;
struct snd_soc_dai *source, *sink; struct snd_soc_dai *source, *sink;
struct snd_soc_pcm_runtime *rtd = w->priv; struct snd_soc_pcm_runtime *rtd = substream->private_data;
const struct snd_soc_pcm_stream *config;
struct snd_pcm_substream substream;
struct snd_pcm_hw_params *params = NULL; struct snd_pcm_hw_params *params = NULL;
struct snd_pcm_runtime *runtime = NULL; const struct snd_soc_pcm_stream *config = NULL;
unsigned int fmt; unsigned int fmt;
int ret = 0; int ret;
params = kzalloc(sizeof(*params), GFP_KERNEL);
if (!params)
return -ENOMEM;
substream->stream = SNDRV_PCM_STREAM_CAPTURE;
snd_soc_dapm_widget_for_each_source_path(w, path) {
source = path->source->priv;
ret = snd_soc_dai_startup(source, substream);
if (ret < 0) {
dev_err(source->dev,
"ASoC: startup() failed: %d\n", ret);
goto out;
}
source->active++;
}
substream->stream = SNDRV_PCM_STREAM_PLAYBACK;
snd_soc_dapm_widget_for_each_sink_path(w, path) {
sink = path->sink->priv;
ret = snd_soc_dai_startup(sink, substream);
if (ret < 0) {
dev_err(sink->dev,
"ASoC: startup() failed: %d\n", ret);
goto out;
}
sink->active++;
}
/*
* Note: getting the config after .startup() gives a chance to
* either party on the link to alter the configuration if
* necessary
*/
config = rtd->dai_link->params + rtd->params_select; config = rtd->dai_link->params + rtd->params_select;
if (WARN_ON(!config)) {
if (WARN_ON(!config) || dev_err(w->dapm->dev, "ASoC: link config missing\n");
WARN_ON(list_empty(&w->edges[SND_SOC_DAPM_DIR_OUT]) || ret = -EINVAL;
list_empty(&w->edges[SND_SOC_DAPM_DIR_IN]))) goto out;
return -EINVAL; }
/* Be a little careful as we don't want to overflow the mask array */ /* Be a little careful as we don't want to overflow the mask array */
if (config->formats) { if (config->formats) {
@ -3790,27 +3824,62 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
} else { } else {
dev_warn(w->dapm->dev, "ASoC: Invalid format %llx specified\n", dev_warn(w->dapm->dev, "ASoC: Invalid format %llx specified\n",
config->formats); config->formats);
fmt = 0;
}
/* Currently very limited parameter selection */ ret = -EINVAL;
params = kzalloc(sizeof(*params), GFP_KERNEL);
if (!params) {
ret = -ENOMEM;
goto out; goto out;
} }
snd_mask_set(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT), fmt);
snd_mask_set(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT), fmt);
hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->min = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->min =
config->rate_min; config->rate_min;
hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->max = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->max =
config->rate_max; config->rate_max;
hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->min hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->min
= config->channels_min; = config->channels_min;
hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->max hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->max
= config->channels_max; = config->channels_max;
substream->stream = SNDRV_PCM_STREAM_CAPTURE;
snd_soc_dapm_widget_for_each_source_path(w, path) {
source = path->source->priv;
ret = snd_soc_dai_hw_params(source, substream, params);
if (ret < 0)
goto out;
dapm_update_dai_unlocked(substream, params, source);
}
substream->stream = SNDRV_PCM_STREAM_PLAYBACK;
snd_soc_dapm_widget_for_each_sink_path(w, path) {
sink = path->sink->priv;
ret = snd_soc_dai_hw_params(sink, substream, params);
if (ret < 0)
goto out;
dapm_update_dai_unlocked(substream, params, sink);
}
out:
kfree(params);
return 0;
}
static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event)
{
struct snd_soc_dapm_path *path;
struct snd_soc_dai *source, *sink;
struct snd_soc_pcm_runtime *rtd = w->priv;
struct snd_pcm_substream substream;
struct snd_pcm_runtime *runtime = NULL;
int ret = 0;
if (WARN_ON(list_empty(&w->edges[SND_SOC_DAPM_DIR_OUT]) ||
list_empty(&w->edges[SND_SOC_DAPM_DIR_IN])))
return -EINVAL;
memset(&substream, 0, sizeof(substream)); memset(&substream, 0, sizeof(substream));
/* Allocate a dummy snd_pcm_runtime for startup() and other ops() */ /* Allocate a dummy snd_pcm_runtime for startup() and other ops() */
@ -3824,53 +3893,10 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
switch (event) { switch (event) {
case SND_SOC_DAPM_PRE_PMU: case SND_SOC_DAPM_PRE_PMU:
substream.stream = SNDRV_PCM_STREAM_CAPTURE; ret = snd_soc_dai_link_event_pre_pmu(w, &substream);
snd_soc_dapm_widget_for_each_source_path(w, path) { if (ret < 0)
source = path->source->priv; goto out;
ret = snd_soc_dai_startup(source, &substream);
if (ret < 0) {
dev_err(source->dev,
"ASoC: startup() failed: %d\n", ret);
goto out;
}
source->active++;
}
substream.stream = SNDRV_PCM_STREAM_PLAYBACK;
snd_soc_dapm_widget_for_each_sink_path(w, path) {
sink = path->sink->priv;
ret = snd_soc_dai_startup(sink, &substream);
if (ret < 0) {
dev_err(sink->dev,
"ASoC: startup() failed: %d\n", ret);
goto out;
}
sink->active++;
}
substream.stream = SNDRV_PCM_STREAM_CAPTURE;
snd_soc_dapm_widget_for_each_source_path(w, path) {
source = path->source->priv;
ret = snd_soc_dai_hw_params(source, &substream, params);
if (ret < 0)
goto out;
dapm_update_dai_unlocked(&substream, params, source);
}
substream.stream = SNDRV_PCM_STREAM_PLAYBACK;
snd_soc_dapm_widget_for_each_sink_path(w, path) {
sink = path->sink->priv;
ret = snd_soc_dai_hw_params(sink, &substream, params);
if (ret < 0)
goto out;
dapm_update_dai_unlocked(&substream, params, sink);
}
break; break;
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
@ -3932,7 +3958,6 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
out: out:
kfree(runtime); kfree(runtime);
kfree(params);
return ret; return ret;
} }