Skip to content

audio: module_adapter: Set the pipeline pointer during init #10288

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
kv2019i merged 1 commit into from
Oct 10, 2025
Merged

audio: module_adapter: Set the pipeline pointer during init #10288

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
20 changes: 3 additions & 17 deletions src/audio/copier/copier.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,10 @@ static void mic_privacy_free(struct copier_data *cd)
__cold static int copier_init(struct processing_module *mod)
{
union ipc4_connector_node_id node_id;
struct ipc_comp_dev *ipc_pipe;
struct ipc *ipc = ipc_get();
struct copier_data *cd;
struct comp_dev *dev = mod->dev;
struct module_data *md = &mod->priv;
struct ipc4_copier_module_cfg *copier = (struct ipc4_copier_module_cfg *)md->cfg.init_data;
struct comp_ipc_config *config = &dev->ipc_config;
void *gtw_cfg = NULL;
size_t gtw_cfg_size;
int i, ret = 0;
Expand Down Expand Up @@ -186,17 +183,6 @@ __cold static int copier_init(struct processing_module *mod)
for (i = 0; i < IPC4_COPIER_MODULE_OUTPUT_PINS_COUNT; i++)
cd->out_fmt[i] = cd->config.out_fmt;

ipc_pipe = ipc_get_comp_by_ppl_id(ipc, COMP_TYPE_PIPELINE,
config->pipeline_id,
IPC_COMP_IGNORE_REMOTE);
if (!ipc_pipe) {
comp_err(dev, "pipeline %d is not existed", config->pipeline_id);
ret = -EPIPE;
goto error;
}

dev->pipeline = ipc_pipe->pipeline;

node_id = copier->gtw_cfg.node_id;
/* copier is linked to gateway */
if (node_id.dw != IPC4_INVALID_NODE_ID) {
Expand All @@ -205,7 +191,7 @@ __cold static int copier_init(struct processing_module *mod)
switch (node_id.f.dma_type) {
case ipc4_hda_host_output_class:
case ipc4_hda_host_input_class:
ret = copier_host_create(dev, cd, copier, ipc_pipe->pipeline);
ret = copier_host_create(dev, cd, copier, dev->pipeline);
if (ret < 0) {
comp_err(dev, "unable to create host");
goto error;
Expand All @@ -228,7 +214,7 @@ __cold static int copier_init(struct processing_module *mod)
case ipc4_i2s_link_input_class:
case ipc4_alh_link_output_class:
case ipc4_alh_link_input_class:
ret = copier_dai_create(dev, cd, copier, ipc_pipe->pipeline);
ret = copier_dai_create(dev, cd, copier, dev->pipeline);
if (ret < 0) {
comp_err(dev, "unable to create dai");
goto error;
Expand All @@ -246,7 +232,7 @@ __cold static int copier_init(struct processing_module *mod)
#if CONFIG_IPC4_GATEWAY
case ipc4_ipc_output_class:
case ipc4_ipc_input_class:
ret = copier_ipcgtw_create(dev, cd, copier, ipc_pipe->pipeline);
ret = copier_ipcgtw_create(dev, cd, copier, dev->pipeline);
if (ret < 0) {
comp_err(dev, "unable to create IPC gateway");
goto error;
Expand Down
11 changes: 11 additions & 0 deletions src/audio/module_adapter/module_adapter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,17 @@ struct comp_dev *module_adapter_new_ext(const struct comp_driver *drv,
else
goto err;

#if CONFIG_IPC_MAJOR_4
struct ipc_comp_dev *ipc_pipe;
struct ipc *ipc = ipc_get();

/* set the pipeline pointer if ipc_pipe is valid */
ipc_pipe = ipc_get_comp_by_ppl_id(ipc, COMP_TYPE_PIPELINE, config->pipeline_id,
IPC_COMP_IGNORE_REMOTE);
if (ipc_pipe)
dev->pipeline = ipc_pipe->pipeline;
#endif

/* Init processing module */
ret = module_init(mod);
if (ret) {
Expand Down
Loading