Skip to content

Fix pipeline set up with multi-stream capture#3858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plbossart merged 3 commits into from
Sep 19, 2022
Merged

Fix pipeline set up with multi-stream capture #3858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7816824
ASoC: soc-pcm: Export widget_in_list()
ranj063 Sep 13, 2022
bc7eecf
ASoC: SOF: sof-audio: Set up/free DAI/AIF widgets only once
ranj063 Sep 13, 2022
1d420f4
ASoC: SOF: sof-audio: Only process widgets in the connected widget list
ranj063 Sep 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/sound/soc-dpcm.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,8 @@ int dpcm_be_dai_prepare(struct snd_soc_pcm_runtime *fe, int stream);
int dpcm_dapm_stream_event(struct snd_soc_pcm_runtime *fe, int dir,
int event);
bool dpcm_end_walk_at_be(struct snd_soc_dapm_widget *widget, enum snd_soc_dapm_direction dir);
int widget_in_list(struct snd_soc_dapm_widget_list *list,
struct snd_soc_dapm_widget *widget);

#define dpcm_be_dai_startup_rollback(fe, stream, last) \
dpcm_be_dai_stop(fe, stream, 0, last)
Expand Down
3 changes: 2 additions & 1 deletion sound/soc/soc-pcm.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1332,7 +1332,7 @@ static struct snd_soc_pcm_runtime *dpcm_get_be(struct snd_soc_card *card,
return NULL;
}

static int widget_in_list(struct snd_soc_dapm_widget_list *list,
int widget_in_list(struct snd_soc_dapm_widget_list *list,
struct snd_soc_dapm_widget *widget)
{
struct snd_soc_dapm_widget *w;
Expand All@@ -1344,6 +1344,7 @@ static int widget_in_list(struct snd_soc_dapm_widget_list *list,

return 0;
}
EXPORT_SYMBOL_GPL(widget_in_list);

bool dpcm_end_walk_at_be(struct snd_soc_dapm_widget *widget, enum snd_soc_dapm_direction dir)
{
Expand Down
87 changes: 44 additions & 43 deletions sound/soc/sof/sof-audio.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -263,7 +263,8 @@ static int sof_setup_pipeline_connections(struct snd_sof_dev *sdev,
}

static void
sof_unprepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widget *widget)
sof_unprepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widget *widget,
struct snd_soc_dapm_widget_list *list)
{
const struct sof_ipc_tplg_ops *ipc_tplg_ops = sdev->ipc->ops->tplg;
const struct sof_ipc_tplg_widget_ops *widget_ops = ipc_tplg_ops->widget;
Expand All@@ -282,9 +283,11 @@ sof_unprepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widg

/* unprepare all widgets in the sink paths */
snd_soc_dapm_widget_for_each_sink_path(widget, p) {
if (!widget_in_list(list, p->sink))
continue;

@ujfalusiujfalusiSep 14, 2022

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How this happens?
We walk from source to sink, so walk through the widgets which are in the path.
How we are enabling a widget (which is in the path) which is not in the path?

@ranj063ranj063Sep 14, 2022

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ujfalusi snd_soc_dapm_widget_for_each_sink_path() looks at all paths leaving the widget not just the ones that have an active DAPM widget associated with the PCM.

@ujfalusiujfalusiSep 19, 2022

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ranj063, oh yes, I see now, thanks!

if (!p->walking && p->sink->dobj.private) {
p->walking = true;
sof_unprepare_widgets_in_path(sdev, p->sink);
sof_unprepare_widgets_in_path(sdev, p->sink, list);
p->walking = false;
}
}
Expand All@@ -294,7 +297,8 @@ static int
sof_prepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widget *widget,
struct snd_pcm_hw_params *fe_params,
struct snd_sof_platform_stream_params *platform_params,
struct snd_pcm_hw_params *pipeline_params, int dir)
struct snd_pcm_hw_params *pipeline_params, int dir,
struct snd_soc_dapm_widget_list *list)
{
const struct sof_ipc_tplg_ops *ipc_tplg_ops = sdev->ipc->ops->tplg;
const struct sof_ipc_tplg_widget_ops *widget_ops = ipc_tplg_ops->widget;
Expand All@@ -318,10 +322,13 @@ sof_prepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widget
sink_prepare:
/* prepare all widgets in the sink paths */
snd_soc_dapm_widget_for_each_sink_path(widget, p) {
if (!widget_in_list(list, p->sink))
continue;
if (!p->walking && p->sink->dobj.private) {
p->walking = true;
ret = sof_prepare_widgets_in_path(sdev, p->sink, fe_params,
platform_params, pipeline_params, dir);
platform_params, pipeline_params, dir,
list);
p->walking = false;
if (ret < 0) {
/* unprepare the source widget */
Expand All@@ -342,27 +349,27 @@ sof_prepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widget
* (DAI type for capture, AIF type for playback)
*/
static int sof_free_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widget *widget,
int dir)
int dir, struct snd_soc_dapm_widget_list *list)
{
struct snd_soc_dapm_path *p;
int err;
int ret = 0;

/* free all widgets even in case of error to keep use counts balanced */
if (widget->dobj.private) {
err = sof_widget_free(sdev, widget->dobj.private);
if (err < 0)
ret = err;
}

/* free all widgets in the sink paths even in case of error to keep use counts balanced */
snd_soc_dapm_widget_for_each_sink_path(widget, p) {
if (!p->walking && p->sink->dobj.private && widget->dobj.private) {
p->walking = true;
if (WIDGET_IS_AIF_OR_DAI(widget->id)) {
err = sof_widget_free(sdev, widget->dobj.private);
if (err < 0)
ret = err;
}
Comment thread
plbossart marked this conversation as resolved.
if (!p->walking) {
if (!widget_in_list(list, p->sink))
continue;

err = sof_widget_free(sdev, p->sink->dobj.private);
if (err < 0)
ret = err;
p->walking = true;

err = sof_free_widgets_in_path(sdev, p->sink, dir);
err = sof_free_widgets_in_path(sdev, p->sink, dir, list);
if (err < 0)
ret = err;
p->walking = false;
Expand All@@ -378,37 +385,31 @@ static int sof_free_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dap
* The error path in this function ensures that all successfully set up widgets getting freed.
*/
static int sof_set_up_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widget *widget,
int dir)
int dir, struct snd_soc_dapm_widget_list *list)
{
struct snd_soc_dapm_path *p;
int ret;

if (widget->dobj.private) {
ret = sof_widget_setup(sdev, widget->dobj.private);
if (ret < 0)
return ret;
}

snd_soc_dapm_widget_for_each_sink_path(widget, p) {
if (!p->walking && p->sink->dobj.private && widget->dobj.private) {
p->walking = true;
if (WIDGET_IS_AIF_OR_DAI(widget->id)) {
ret = sof_widget_setup(sdev, widget->dobj.private);
if (ret < 0)
goto out;
}
Comment thread
plbossart marked this conversation as resolved.
if (!p->walking) {
if (!widget_in_list(list, p->sink))
continue;

ret = sof_widget_setup(sdev, p->sink->dobj.private);
if (ret < 0) {
if (WIDGET_IS_AIF_OR_DAI(widget->id))
sof_widget_free(sdev, widget->dobj.private);
goto out;
}
p->walking = true;

ret = sof_set_up_widgets_in_path(sdev, p->sink, dir);
ret = sof_set_up_widgets_in_path(sdev, p->sink, dir, list);
p->walking = false;
if (ret < 0) {
if (WIDGET_IS_AIF_OR_DAI(widget->id))
if (widget->dobj.private)
Comment thread
plbossart marked this conversation as resolved.
sof_widget_free(sdev, widget->dobj.private);
sof_widget_free(sdev, p->sink->dobj.private);
}
out:
p->walking = false;
if (ret < 0)
return ret;
}
Comment thread
plbossart marked this conversation as resolved.
}
}

Expand DownExpand Up@@ -437,11 +438,11 @@ sof_walk_widgets_in_order(struct snd_sof_dev *sdev, struct snd_soc_dapm_widget_l

switch (op) {
case SOF_WIDGET_SETUP:
ret = sof_set_up_widgets_in_path(sdev, widget, dir);
ret = sof_set_up_widgets_in_path(sdev, widget, dir, list);
str = "set up";
break;
case SOF_WIDGET_FREE:
ret = sof_free_widgets_in_path(sdev, widget, dir);
ret = sof_free_widgets_in_path(sdev, widget, dir, list);
str = "free";
break;
case SOF_WIDGET_PREPARE:
Expand All@@ -457,12 +458,12 @@ sof_walk_widgets_in_order(struct snd_sof_dev *sdev, struct snd_soc_dapm_widget_l
*/
memcpy(&pipeline_params, fe_params, sizeof(*fe_params));

ret = sof_prepare_widgets_in_path(sdev, widget, fe_params,
platform_params, &pipeline_params, dir);
ret = sof_prepare_widgets_in_path(sdev, widget, fe_params, platform_params,
&pipeline_params, dir, list);
break;
}
case SOF_WIDGET_UNPREPARE:
sof_unprepare_widgets_in_path(sdev, widget);
sof_unprepare_widgets_in_path(sdev, widget, list);
break;
default:
dev_err(sdev->dev, "Invalid widget op %d\n", op);
Expand Down