Skip to content

Fix pipeline set up with multi-stream capture - #3858

Merged
plbossart merged 3 commits into
thesofproject:topic/sof-devfrom
ranj063:fix/mtl_suspend
Sep 19, 2022
Merged

Fix pipeline set up with multi-stream capture#3858
plbossart merged 3 commits into
thesofproject:topic/sof-devfrom
ranj063:fix/mtl_suspend

Conversation

@ranj063

@ranj063ranj063 commented Sep 13, 2022

Copy link
Copy Markdown
Collaborator

No description provided.

@ranj063
ASoC: soc-pcm: Export widget_in_list()
7816824
Export the widget_in_list() function to be used by other modules.
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
@ranj063ranj063 mentioned this pull request Sep 13, 2022
Closed
plbossart
plbossart reviewed Sep 13, 2022
View reviewed changes
Comment threadsound/soc/sof/sof-audio.c
Comment threadsound/soc/sof/sof-audio.c
plbossart
plbossart previously approved these changes Sep 13, 2022
View reviewed changes
bardliao
bardliao reviewed Sep 13, 2022
View reviewed changes
Comment threadsound/soc/sof/sof-audio.c Outdated
bardliao
bardliao reviewed Sep 13, 2022
View reviewed changes
Comment threadsound/soc/sof/sof-audio.c Outdated
bardliao
bardliao previously approved these changes Sep 13, 2022
View reviewed changes
@ranj063
ASoC: SOF: sof-audio: Set up/free DAI/AIF widgets only once
bc7eecf
Calling the sof_widget_setup/free() for the DAI/AIF widgets inside the
snd_soc_dapm_widget_for_each_sink_path() loop will end up setting up or
freeing the widget multiple times if there are multiple paths leaving
the widget. Fix this by moving the widget setup/free for the starting
widget in each path outside the loop.
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
@ranj063
ASoC: SOF: sof-audio: Only process widgets in the connected widget list
1d420f4
When walking the list of the widgets from the source to the sink, we
accidentally also end up preparing/setting up the widgets that are not
in the list of connected DAPM widgets associated with the PCM. Avoid
this by checking if a widget is part of the connected DAPM widget list
during widget prepare, unprepare, setup or free.
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
ujfalusi
ujfalusi reviewed Sep 14, 2022
View reviewed changes
Comment threadsound/soc/sof/sof-audio.c
/* 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!

plbossart
plbossart reviewed Sep 14, 2022
View reviewed changes

@plbossartplbossart left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks good but two questions on error handling (I haven't changed have I)

Comment threadsound/soc/sof/sof-audio.c
Comment threadsound/soc/sof/sof-audio.c
@plbossart

plbossart commented Sep 15, 2022

Copy link
Copy Markdown
Member

@ujfalusi are you good with this PR, @bardliao tells me it's required for the multi-stream capture support so this needs to be merged soonish.

@plbossart
plbossart merged commit 3157d27 into thesofproject:topic/sof-devSep 19, 2022
@ranj063
ranj063 deleted the fix/mtl_suspend branch September 29, 2022 20:26
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ujfalusiujfalusiujfalusi approved these changes
@plbossartplbossartplbossart approved these changes
@bardliaobardliaobardliao approved these changes
@lgirdwoodlgirdwoodAwaiting requested review from lgirdwoodlgirdwood is a code owner
@kv2019ikv2019iAwaiting requested review from kv2019ikv2019i is a code owner
@dbalutadbalutaAwaiting requested review from dbalutadbaluta is a code owner
@ajitkupandeyajitkupandeyAwaiting requested review from ajitkupandey
@kuanhsunchengkuanhsunchengAwaiting requested review from kuanhsuncheng
@yaochunhungyaochunhungAwaiting requested review from yaochunhung

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ranj063@plbossart@bardliao@ujfalusi