Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0aa94fa authored by Jeeja KP's avatar Jeeja KP Committed by Mark Brown
Browse files

ASoC: Intel: Skylake: Set the DSP pipe type 



DSP pipe type can be a pass through or it can be processing pipe.
In case of pass through pipe, it is a single pipeline with both
host and link copier in the same pipeline.

Identify the DSP pipe type if it pass through or not. Pass through
pipe is identified by checking if it has both host and link copier
in the same pipeline.

Signed-off-by: default avatarJeeja KP <jeeja.kp@intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 287af4f9

sound/soc/intel/skylake/skl-topology.c

+27 −0
Original line number Diff line number Diff line
@@ -1769,6 +1769,29 @@ static int skl_tplg_create_pipe_widget_list(struct snd_soc_platform *platform) 
	return 0;

}



static void skl_tplg_set_pipe_type(struct skl *skl, struct skl_pipe *pipe)

{

	struct skl_pipe_module *w_module;

	struct snd_soc_dapm_widget *w;

	struct skl_module_cfg *mconfig;

	bool host_found = false, link_found = false;



	list_for_each_entry(w_module, &pipe->w_list, node) {

		w = w_module->w;

		mconfig = w->priv;



		if (mconfig->dev_type == SKL_DEVICE_HDAHOST)

			host_found = true;

		else if (mconfig->dev_type != SKL_DEVICE_NONE)

			link_found = true;

	}



	if (host_found && link_found)

		pipe->passthru = true;

	else

		pipe->passthru = false;

}



/* This will be read from topology manifest, currently defined here */

#define SKL_MAX_MCPS 30000000

#define SKL_FW_MAX_MEM 1000000
@@ -1782,6 +1805,7 @@ int skl_tplg_init(struct snd_soc_platform *platform, struct hdac_ext_bus *ebus) 
	const struct firmware *fw;

	struct hdac_bus *bus = ebus_to_hbus(ebus);

	struct skl *skl = ebus_to_skl(ebus);

	struct skl_pipeline *ppl;



	ret = request_firmware(&fw, skl->tplg_name, bus->dev);

	if (ret < 0) {
@@ -1815,5 +1839,8 @@ int skl_tplg_init(struct snd_soc_platform *platform, struct hdac_ext_bus *ebus) 
	if (ret < 0)

		return ret;



	list_for_each_entry(ppl, &skl->ppl_list, node)

		skl_tplg_set_pipe_type(skl, ppl->pipe);



	return 0;

}

sound/soc/intel/skylake/skl-topology.h

+1 −0
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ struct skl_pipe { 
	struct skl_pipe_params *p_params;

	enum skl_pipe_state state;

	struct list_head w_list;

	bool passthru;

};



enum skl_module_state {