|
@@ -485,6 +485,8 @@ 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);
|
|
@@ -511,7 +513,6 @@ skl_tplg_init_pipe_modules(struct skl *skl, struct skl_pipe *pipe)
|
|
|
ret = skl_tplg_set_module_params(w, ctx);
|
|
|
if (ret < 0)
|
|
|
return ret;
|
|
|
- skl_tplg_alloc_pipe_mcps(skl, mconfig);
|
|
|
}
|
|
|
|
|
|
return 0;
|
|
@@ -561,6 +562,9 @@ 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
|
|
@@ -604,9 +608,6 @@ static int skl_tplg_mixer_dapm_pre_pmu_event(struct snd_soc_dapm_widget *w,
|
|
|
src_module = dst_module;
|
|
|
}
|
|
|
|
|
|
- skl_tplg_alloc_pipe_mem(skl, mconfig);
|
|
|
- skl_tplg_alloc_pipe_mcps(skl, mconfig);
|
|
|
-
|
|
|
return 0;
|
|
|
}
|
|
|
|