|
@@ -27,6 +27,10 @@
|
|
#include "skl.h"
|
|
#include "skl.h"
|
|
#include "skl-tplg-interface.h"
|
|
#include "skl-tplg-interface.h"
|
|
|
|
|
|
|
|
+#define SKL_CH_FIXUP_MASK (1 << 0)
|
|
|
|
+#define SKL_RATE_FIXUP_MASK (1 << 1)
|
|
|
|
+#define SKL_FMT_FIXUP_MASK (1 << 2)
|
|
|
|
+
|
|
/*
|
|
/*
|
|
* SKL DSP driver modelling uses only few DAPM widgets so for rest we will
|
|
* SKL DSP driver modelling uses only few DAPM widgets so for rest we will
|
|
* ignore. This helpers checks if the SKL driver handles this widget type
|
|
* ignore. This helpers checks if the SKL driver handles this widget type
|
|
@@ -119,6 +123,137 @@ skl_tplg_free_pipe_mem(struct skl *skl, struct skl_module_cfg *mconfig)
|
|
skl->resource.mem -= mconfig->pipe->memory_pages;
|
|
skl->resource.mem -= mconfig->pipe->memory_pages;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
|
|
+static void skl_dump_mconfig(struct skl_sst *ctx,
|
|
|
|
+ struct skl_module_cfg *mcfg)
|
|
|
|
+{
|
|
|
|
+ dev_dbg(ctx->dev, "Dumping config\n");
|
|
|
|
+ dev_dbg(ctx->dev, "Input Format:\n");
|
|
|
|
+ dev_dbg(ctx->dev, "channels = %d\n", mcfg->in_fmt.channels);
|
|
|
|
+ dev_dbg(ctx->dev, "s_freq = %d\n", mcfg->in_fmt.s_freq);
|
|
|
|
+ dev_dbg(ctx->dev, "ch_cfg = %d\n", mcfg->in_fmt.ch_cfg);
|
|
|
|
+ dev_dbg(ctx->dev, "valid bit depth = %d\n",
|
|
|
|
+ mcfg->in_fmt.valid_bit_depth);
|
|
|
|
+ dev_dbg(ctx->dev, "Output Format:\n");
|
|
|
|
+ dev_dbg(ctx->dev, "channels = %d\n", mcfg->out_fmt.channels);
|
|
|
|
+ dev_dbg(ctx->dev, "s_freq = %d\n", mcfg->out_fmt.s_freq);
|
|
|
|
+ dev_dbg(ctx->dev, "valid bit depth = %d\n",
|
|
|
|
+ mcfg->out_fmt.valid_bit_depth);
|
|
|
|
+ dev_dbg(ctx->dev, "ch_cfg = %d\n", mcfg->out_fmt.ch_cfg);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static void skl_tplg_update_params(struct skl_module_fmt *fmt,
|
|
|
|
+ struct skl_pipe_params *params, int fixup)
|
|
|
|
+{
|
|
|
|
+ if (fixup & SKL_RATE_FIXUP_MASK)
|
|
|
|
+ fmt->s_freq = params->s_freq;
|
|
|
|
+ if (fixup & SKL_CH_FIXUP_MASK)
|
|
|
|
+ fmt->channels = params->ch;
|
|
|
|
+ if (fixup & SKL_FMT_FIXUP_MASK)
|
|
|
|
+ fmt->valid_bit_depth = params->s_fmt;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+/*
|
|
|
|
+ * A pipeline may have modules which impact the pcm parameters, like SRC,
|
|
|
|
+ * channel converter, format converter.
|
|
|
|
+ * We need to calculate the output params by applying the 'fixup'
|
|
|
|
+ * Topology will tell driver which type of fixup is to be applied by
|
|
|
|
+ * supplying the fixup mask, so based on that we calculate the output
|
|
|
|
+ *
|
|
|
|
+ * Now In FE the pcm hw_params is source/target format. Same is applicable
|
|
|
|
+ * for BE with its hw_params invoked.
|
|
|
|
+ * here based on FE, BE pipeline and direction we calculate the input and
|
|
|
|
+ * outfix and then apply that for a module
|
|
|
|
+ */
|
|
|
|
+static void skl_tplg_update_params_fixup(struct skl_module_cfg *m_cfg,
|
|
|
|
+ struct skl_pipe_params *params, bool is_fe)
|
|
|
|
+{
|
|
|
|
+ int in_fixup, out_fixup;
|
|
|
|
+ struct skl_module_fmt *in_fmt, *out_fmt;
|
|
|
|
+
|
|
|
|
+ in_fmt = &m_cfg->in_fmt;
|
|
|
|
+ out_fmt = &m_cfg->out_fmt;
|
|
|
|
+
|
|
|
|
+ if (params->stream == SNDRV_PCM_STREAM_PLAYBACK) {
|
|
|
|
+ if (is_fe) {
|
|
|
|
+ in_fixup = m_cfg->params_fixup;
|
|
|
|
+ out_fixup = (~m_cfg->converter) &
|
|
|
|
+ m_cfg->params_fixup;
|
|
|
|
+ } else {
|
|
|
|
+ out_fixup = m_cfg->params_fixup;
|
|
|
|
+ in_fixup = (~m_cfg->converter) &
|
|
|
|
+ m_cfg->params_fixup;
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ if (is_fe) {
|
|
|
|
+ out_fixup = m_cfg->params_fixup;
|
|
|
|
+ in_fixup = (~m_cfg->converter) &
|
|
|
|
+ m_cfg->params_fixup;
|
|
|
|
+ } else {
|
|
|
|
+ in_fixup = m_cfg->params_fixup;
|
|
|
|
+ out_fixup = (~m_cfg->converter) &
|
|
|
|
+ m_cfg->params_fixup;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ skl_tplg_update_params(in_fmt, params, in_fixup);
|
|
|
|
+ skl_tplg_update_params(out_fmt, params, out_fixup);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+/*
|
|
|
|
+ * A module needs input and output buffers, which are dependent upon pcm
|
|
|
|
+ * params, so once we have calculate params, we need buffer calculation as
|
|
|
|
+ * well.
|
|
|
|
+ */
|
|
|
|
+static void skl_tplg_update_buffer_size(struct skl_sst *ctx,
|
|
|
|
+ struct skl_module_cfg *mcfg)
|
|
|
|
+{
|
|
|
|
+ int multiplier = 1;
|
|
|
|
+
|
|
|
|
+ if (mcfg->m_type == SKL_MODULE_TYPE_SRCINT)
|
|
|
|
+ multiplier = 5;
|
|
|
|
+
|
|
|
|
+ mcfg->ibs = (mcfg->in_fmt.s_freq / 1000) *
|
|
|
|
+ (mcfg->in_fmt.channels) *
|
|
|
|
+ (mcfg->in_fmt.bit_depth >> 3) *
|
|
|
|
+ multiplier;
|
|
|
|
+
|
|
|
|
+ mcfg->obs = (mcfg->out_fmt.s_freq / 1000) *
|
|
|
|
+ (mcfg->out_fmt.channels) *
|
|
|
|
+ (mcfg->out_fmt.bit_depth >> 3) *
|
|
|
|
+ multiplier;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static void skl_tplg_update_module_params(struct snd_soc_dapm_widget *w,
|
|
|
|
+ struct skl_sst *ctx)
|
|
|
|
+{
|
|
|
|
+ struct skl_module_cfg *m_cfg = w->priv;
|
|
|
|
+ struct skl_pipe_params *params = m_cfg->pipe->p_params;
|
|
|
|
+ int p_conn_type = m_cfg->pipe->conn_type;
|
|
|
|
+ bool is_fe;
|
|
|
|
+
|
|
|
|
+ if (!m_cfg->params_fixup)
|
|
|
|
+ return;
|
|
|
|
+
|
|
|
|
+ dev_dbg(ctx->dev, "Mconfig for widget=%s BEFORE updation\n",
|
|
|
|
+ w->name);
|
|
|
|
+
|
|
|
|
+ skl_dump_mconfig(ctx, m_cfg);
|
|
|
|
+
|
|
|
|
+ if (p_conn_type == SKL_PIPE_CONN_TYPE_FE)
|
|
|
|
+ is_fe = true;
|
|
|
|
+ else
|
|
|
|
+ is_fe = false;
|
|
|
|
+
|
|
|
|
+ skl_tplg_update_params_fixup(m_cfg, params, is_fe);
|
|
|
|
+ skl_tplg_update_buffer_size(ctx, m_cfg);
|
|
|
|
+
|
|
|
|
+ dev_dbg(ctx->dev, "Mconfig for widget=%s AFTER updation\n",
|
|
|
|
+ w->name);
|
|
|
|
+
|
|
|
|
+ skl_dump_mconfig(ctx, m_cfg);
|
|
|
|
+}
|
|
|
|
+
|
|
/*
|
|
/*
|
|
* A pipe can have multiple modules, each of them will be a DAPM widget as
|
|
* A pipe can have multiple modules, each of them will be a DAPM widget as
|
|
* well. While managing a pipeline we need to get the list of all the
|
|
* well. While managing a pipeline we need to get the list of all the
|
|
@@ -178,6 +313,11 @@ skl_tplg_init_pipe_modules(struct skl *skl, struct skl_pipe *pipe)
|
|
if (!skl_tplg_alloc_pipe_mcps(skl, mconfig))
|
|
if (!skl_tplg_alloc_pipe_mcps(skl, mconfig))
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
+ /*
|
|
|
|
+ * apply fix/conversion to module params based on
|
|
|
|
+ * FE/BE params
|
|
|
|
+ */
|
|
|
|
+ skl_tplg_update_module_params(w, ctx);
|
|
ret = skl_init_module(ctx, mconfig, NULL);
|
|
ret = skl_init_module(ctx, mconfig, NULL);
|
|
if (ret < 0)
|
|
if (ret < 0)
|
|
return ret;
|
|
return ret;
|