Skip to content

ipc4: revert "ipc4: fix pipeline reset" #5546

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
lgirdwood merged 1 commit into from
Mar 15, 2022
Merged

ipc4: revert "ipc4: fix pipeline reset" #5546

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
30 changes: 1 addition & 29 deletions src/ipc/ipc4/handler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,30 +153,6 @@ static int ipc4_pcm_params(struct ipc_comp_dev *pcm_dev)
return err;
}

static int propagate_state_to_ppl_comp(struct ipc *ipc, uint32_t ppl_id, int cmd)
{
int ret = IPC4_INVALID_RESOURCE_ID;
struct ipc_comp_dev *icd;
struct list_item *clist;

list_for_item(clist, &ipc->comp_list) {
icd = container_of(clist, struct ipc_comp_dev, list);
if (icd->type != COMP_TYPE_COMPONENT)
continue;

if (!cpu_is_me(icd->core))
continue;

if (ipc_comp_pipe_id(icd) == ppl_id) {
ret = comp_set_state(icd->cd, cmd);
if (ret != 0)
return IPC4_INVALID_REQUEST;
}
}

return ret;
}

static bool is_any_ppl_active(void)
{
struct ipc_comp_dev *icd;
Expand Down Expand Up @@ -303,13 +279,9 @@ static int set_pipeline_state(uint32_t id, uint32_t cmd, bool *delayed)
}
}

ret = propagate_state_to_ppl_comp(ipc, id, COMP_TRIGGER_RESET);
if (ret != 0)
return ret;

/* resource is not released by triggering reset which is used by current FW */
ret = pipeline_reset(host->cd->pipeline, host->cd);
if (ret != 0)
if (ret < 0)
ret = IPC4_INVALID_REQUEST;

return ret;
Expand Down