Skip to content

audio: pipeline: fix control init order and unrouted component prepare in static pipeline #11315

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

Draft
lgirdwood wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

audio: pipeline: fix control init order and unrouted component prepare in static pipeline #11315

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77d8dad
audio: pipeline: publish active topology before kcontrol initialization
lgirdwood Oct 15, 2026
a0838bc
audio: pipeline: skip unrouted components during component prepare
lgirdwood Oct 15, 2026
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
11 changes: 7 additions & 4 deletions src/audio/pipeline/static_pipeline_loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,8 +875,10 @@ static int sof_static_topology_prepare_comps(const struct sof_static_topology *t
if (!dev)
continue;

/* Only prepare components currently in READY state */
/* Only prepare components currently in READY state that are connected to buffers */
if (dev->state == COMP_STATE_READY) {
if (list_is_empty(&dev->bsource_list) && list_is_empty(&dev->bsink_list))
continue;
const struct sof_static_comp *cdesc = &topo->comps[i];
const struct sof_static_pipeline_desc *pdesc =
sof_static_find_pipeline_desc(topo, cdesc->pipeline_id);
Expand Down Expand Up @@ -1108,21 +1110,22 @@ int sof_static_topology_init(const struct sof_static_topology *topo)
goto err_unwind;
}

/* Publish topology as active before initializing kcontrols */
s_active_topo = topo;

/* Stage 7: Initialize kcontrols with default values */
ret = sof_static_topology_init_controls(topo);
if (ret < 0) {
LOG_ERR("sof_static_topology_init: stage 7 (init_controls) failed: %d", ret);
goto err_unwind;
}

/* Publish topology as active only after all construction stages succeed */
s_active_topo = topo;

LOG_INF("Static audio topology initialized successfully (%zu pipelines, %zu comps, %zu buffers, %zu controls)",
topo->num_pipelines, topo->num_comps, topo->num_buffers, topo->num_controls);
return 0;

err_unwind:
s_active_topo = NULL;
sof_static_topology_unwind();
return ret;
}
Expand Down
Loading