Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion src/audio/pipeline/pipeline-graph.c
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ static int pipeline_comp_reset(struct comp_dev *current,
* scheduled together, except for IPC4, where each pipeline receives
* commands from the host separately
*/
if (!is_single_ppl && IPC4_MOD_ID(current->ipc_config.id))
if (!is_single_ppl && IS_ENABLED(CONFIG_IPC_MAJOR_4))
return 0;

/* Propagate reset across pipelines only in the same direction
Expand Down
2 changes: 1 addition & 1 deletion src/audio/pipeline/pipeline-params.c
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ static int pipeline_comp_prepare(struct comp_dev *current,

if (!comp_is_single_pipeline(current, ppl_data->start)) {
/* ipc4 module is only prepared in its parent pipeline */
if (IPC4_MOD_ID(current->ipc_config.id))
if (IS_ENABLED(CONFIG_IPC_MAJOR_4))
return 0;

/* Propagate prepare only to pipelines in the same direction */
Expand Down
12 changes: 11 additions & 1 deletion src/audio/pipeline/pipeline-schedule.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ static enum task_state pipeline_task_cmd(struct pipeline *p,
err = SOF_TASK_STATE_RESCHEDULE;
} else if (p->status == COMP_STATE_PAUSED) {
/* reset the pipeline components for IPC4 after the STOP trigger */
if (cmd == COMP_TRIGGER_STOP && IPC4_MOD_ID(host->ipc_config.id)) {
if (cmd == COMP_TRIGGER_STOP && IS_ENABLED(CONFIG_IPC_MAJOR_4)) {
err = pipeline_reset(host->pipeline, host);
if (err < 0)
reply->error = err;
Expand Down Expand Up @@ -284,6 +284,16 @@ void pipeline_schedule_triggered(struct pipeline_walk_context *ctx,
struct pipeline *p;
uint32_t flags;

#ifdef CONFIG_IPC_MAJOR_4
/*
* With IPC4, each pipeline is triggered separately. Exactly 1 pipeline
* is expected in the pipelines list (it's unclear whether an empty list
* should be tolerated).
*/
assert(list_is_empty(&ctx->pipelines) ||
list_item_is_last(ctx->pipelines.next, &ctx->pipelines));
#endif

/*
* Interrupts have to be disabled while adding tasks to or removing them
* from the scheduler list. Without that scheduling can begin
Expand Down
2 changes: 1 addition & 1 deletion src/audio/pipeline/pipeline-stream.c
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ static int pipeline_comp_list(struct comp_dev *current,
* component and we aren't using IPC4. With IPC4 each pipeline receives
* commands separately so we don't need to trigger them together
*/
if (!is_single_ppl && (!is_same_sched || IPC4_MOD_ID(current->ipc_config.id))) {
if (!is_single_ppl && (!is_same_sched || IS_ENABLED(CONFIG_IPC_MAJOR_4))) {
pipe_dbg(current->pipeline,
"current is from another pipeline");
return 0;
Expand Down
Loading