Skip to content

Commit 16a0274

Browse files
committed
Revert "module: Add support for module-specific init data"
This reverts commit d263649. It breaks SRC in DP mode. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent 85323f9 commit 16a0274

3 files changed

Lines changed: 3 additions & 21 deletions

File tree

src/audio/module_adapter/module_adapter_ipc4.c

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -80,18 +80,6 @@ int module_ext_init_decode(const struct comp_driver *drv, struct module_ext_init
8080
dp_data->shared_bytes);
8181
break;
8282
}
83-
case IPC4_MOD_INIT_DATA_ID_MODULE_DATA:
84-
{
85-
/*
86-
* set the module init_data. Modules must copy/save this in their init
87-
* callbacks if they need this to be persistent
88-
*/
89-
ext_data->module_data = (const void *)(obj + 1);
90-
ext_data->module_data_size = obj->object_words * sizeof(uint32_t);
91-
comp_cl_info(drv, "module init data size %u bytes",
92-
ext_data->module_data_size);
93-
break;
94-
}
9583
default:
9684
comp_cl_info(drv, "Unknown ext init object id %u of %u words",
9785
obj->object_id, obj->object_words);
@@ -159,11 +147,8 @@ int module_adapter_init_data(struct comp_dev *dev,
159147
}
160148
}
161149

162-
if (!config->ipc_extended_init) {
163-
dst->init_data = cfg; /* legacy API */
164-
dst->avail = true;
165-
}
166-
150+
dst->init_data = cfg; /* legacy API */
151+
dst->avail = true;
167152
return 0;
168153
}
169154

src/include/ipc4/module.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ struct ipc4_vendor_error {
7777
enum ipc4_mod_init_data_glb_id {
7878
IPC4_MOD_INIT_DATA_ID_INVALID = 0,
7979
IPC4_MOD_INIT_DATA_ID_DP_DATA = 1,
80-
IPC4_MOD_INIT_DATA_ID_MODULE_DATA = 2,
81-
IPC4_MOD_INIT_DATA_ID_MAX = IPC4_MOD_INIT_DATA_ID_MODULE_DATA,
80+
IPC4_MOD_INIT_DATA_ID_MAX = IPC4_MOD_INIT_DATA_ID_DP_DATA,
8281
};
8382

8483
/* data object for vendor bespoke data with ABI growth and backwards compat */

src/include/module/module/base.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
struct ipc4_module_init_ext_obj_dp_data;
3434
struct module_ext_init_data {
3535
const struct ipc4_module_init_ext_obj_dp_data *dp_data;
36-
const void *module_data;
37-
size_t module_data_size;
3836
};
3937

4038
/**

0 commit comments

Comments
 (0)