Skip to content

fixup! ASoC: SOF: pcm: Split up widget prepare and setup #5323

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
ranj063 merged 1 commit into from
Feb 11, 2025
Merged

fixup! ASoC: SOF: pcm: Split up widget prepare and setup #5323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions sound/soc/sof/sof-audio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,8 +736,8 @@ int sof_widget_list_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm,
struct snd_soc_dapm_widget *widget;
int i, ret;

/* nothing to set up */
if (!list)
/* nothing to set up or setup has been already done */
if (!list || spcm->setup_done[dir])
return 0;

/* Set up is used to send the IPC to the DSP to create the widget */
Expand Down Expand Up @@ -794,6 +794,8 @@ int sof_widget_list_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm,
}
}

spcm->setup_done[dir] = true;

return 0;

widget_free:
Expand All @@ -811,12 +813,13 @@ int sof_widget_list_free(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm, int
int ret;

/* nothing to free */
if (!list)
if (!list || !spcm->setup_done[dir])
return 0;

/* send IPC to free widget in the DSP */
ret = sof_walk_widgets_in_order(sdev, spcm, NULL, NULL, dir, SOF_WIDGET_FREE);

spcm->setup_done[dir] = false;
pipeline_list->count = 0;

return ret;
Expand Down
1 change: 1 addition & 0 deletions sound/soc/sof/sof-audio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,7 @@ struct snd_sof_pcm {
struct snd_pcm_hw_params params[2];
struct snd_sof_platform_stream_params platform_params[2];
bool prepared[2]; /* PCM_PARAMS set successfully */
bool setup_done[2]; /* the setup of the SOF PCM device is done */
bool pending_stop[2]; /* only used if (!pcm_ops->platform_stop_during_hw_free) */

/* Must be last - ends in a flex-array member. */
Expand Down
Loading