ASoC: Intel: Skylake: Add memory pages to widget data.

A module can require extra memory for processing, like audio
algorithms. The memory for these modules needs to be represented
in base module configuration and passed to DSP on init, so add
the memory pages as a field in widget data

Signed-off-by: Dharageswari.R <dharageswari.r@intel.com>
Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c
index 7770a7e4162f4b3f288607ca27493b188a92dd79..5297b345839a288728123d270906f393368302c0 100644 (file)
--- a/sound/soc/intel/skylake/skl-messages.c
+++ b/sound/soc/intel/skylake/skl-messages.c
@@ -212,6 +212,7 @@ static void skl_set_base_module_format(struct skl_sst *ctx,
        base_cfg->cps = mconfig->mcps;
        base_cfg->ibs = mconfig->ibs;
        base_cfg->obs = mconfig->obs;
+       base_cfg->is_pages = mconfig->mem_pages;
 }
 
 /*

diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index 32735eff386cac078a1719b822bc0a1db3849b0e..be02214e80dbe1c4630049d3bf439ee4f4fb4612 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -1339,6 +1339,7 @@ static int skl_tplg_widget_load(struct snd_soc_component *cmpnt,
        mconfig->converter = dfw_config->converter;
        mconfig->m_type = dfw_config->module_type;
        mconfig->vbus_id = dfw_config->vbus_id;
+       mconfig->mem_pages = dfw_config->mem_pages;
 
        pipe = skl_tplg_add_pipe(bus->dev, skl, &dfw_config->pipe);
        if (pipe)

diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h
index 51e785424a37a391a7fdf8fb09b68425d06a320e..04318e2091fdd4d6b4f59d85d71ba79efe430329 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.h
+++ b/sound/soc/intel/skylake/skl-topology.h
@@ -277,6 +277,7 @@ struct skl_module_cfg {
        u32 params_fixup;
        u32 converter;
        u32 vbus_id;
+       u32 mem_pages;
        struct skl_module_pin *m_in_pin;
        struct skl_module_pin *m_out_pin;
        enum skl_module_type m_type;