|
@@ -514,8 +514,6 @@ skl_tplg_init_pipe_modules(struct skl *skl, struct skl_pipe *pipe)
|
|
|
if (!skl_is_pipe_mcps_avail(skl, mconfig))
|
|
|
return -ENOMEM;
|
|
|
|
|
|
- skl_tplg_alloc_pipe_mcps(skl, mconfig);
|
|
|
-
|
|
|
if (mconfig->is_loadable && ctx->dsp->fw_ops.load_mod) {
|
|
|
ret = ctx->dsp->fw_ops.load_mod(ctx->dsp,
|
|
|
mconfig->id.module_id, mconfig->guid);
|
|
@@ -539,6 +537,7 @@ skl_tplg_init_pipe_modules(struct skl *skl, struct skl_pipe *pipe)
|
|
|
if (ret < 0)
|
|
|
return ret;
|
|
|
|
|
|
+ skl_tplg_alloc_pipe_mcps(skl, mconfig);
|
|
|
ret = skl_tplg_set_module_params(w, ctx);
|
|
|
if (ret < 0)
|
|
|
return ret;
|
|
@@ -591,9 +590,6 @@ static int skl_tplg_mixer_dapm_pre_pmu_event(struct snd_soc_dapm_widget *w,
|
|
|
if (!skl_is_pipe_mem_avail(skl, mconfig))
|
|
|
return -ENOMEM;
|
|
|
|
|
|
- skl_tplg_alloc_pipe_mem(skl, mconfig);
|
|
|
- skl_tplg_alloc_pipe_mcps(skl, mconfig);
|
|
|
-
|
|
|
/*
|
|
|
* Create a list of modules for pipe.
|
|
|
* This list contains modules from source to sink
|
|
@@ -602,6 +598,9 @@ static int skl_tplg_mixer_dapm_pre_pmu_event(struct snd_soc_dapm_widget *w,
|
|
|
if (ret < 0)
|
|
|
return ret;
|
|
|
|
|
|
+ skl_tplg_alloc_pipe_mem(skl, mconfig);
|
|
|
+ skl_tplg_alloc_pipe_mcps(skl, mconfig);
|
|
|
+
|
|
|
/*
|
|
|
* we create a w_list of all widgets in that pipe. This list is not
|
|
|
* freed on PMD event as widgets within a pipe are static. This
|
|
@@ -949,13 +948,17 @@ static int skl_tplg_mixer_dapm_post_pmd_event(struct snd_soc_dapm_widget *w,
|
|
|
struct skl_pipe *s_pipe = mconfig->pipe;
|
|
|
int ret = 0;
|
|
|
|
|
|
+ if (s_pipe->state == SKL_PIPE_INVALID)
|
|
|
+ return -EINVAL;
|
|
|
+
|
|
|
skl_tplg_free_pipe_mcps(skl, mconfig);
|
|
|
skl_tplg_free_pipe_mem(skl, mconfig);
|
|
|
|
|
|
list_for_each_entry(w_module, &s_pipe->w_list, node) {
|
|
|
dst_module = w_module->w->priv;
|
|
|
|
|
|
- skl_tplg_free_pipe_mcps(skl, dst_module);
|
|
|
+ if (mconfig->m_state >= SKL_MODULE_INIT_DONE)
|
|
|
+ skl_tplg_free_pipe_mcps(skl, dst_module);
|
|
|
if (src_module == NULL) {
|
|
|
src_module = dst_module;
|
|
|
continue;
|