ASoC: Intel: Multiple I/O PCM format support for pipe (1b450791) · Commits · 戴 / test

include/uapi/sound/skl-tplg-interface.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@
		*/
		#define SKL_CONTROL_TYPE_BYTE_TLV 0x100
		#define SKL_CONTROL_TYPE_MIC_SELECT 0x102
		#define SKL_CONTROL_TYPE_MULTI_IO_SELECT 0x103

		#define HDA_SST_CFG_MAX 900 /* size of copier cfg*/
		#define MAX_IN_QUEUE 8

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

+95 −0

Original line number	Diff line number	Diff line
		@@ -579,6 +579,38 @@ static int skl_tplg_unload_pipe_modules(struct skl_dev *skl,
		return ret;
		}

		static bool skl_tplg_is_multi_fmt(struct skl_dev skl, struct skl_pipe pipe)
		{
		struct skl_pipe_fmt *cur_fmt;
		struct skl_pipe_fmt *next_fmt;
		int i;

		if (pipe->nr_cfgs <= 1)
		return false;

		if (pipe->conn_type != SKL_PIPE_CONN_TYPE_FE)
		return true;

		for (i = 0; i < pipe->nr_cfgs - 1; i++) {
		if (pipe->direction == SNDRV_PCM_STREAM_PLAYBACK) {
		cur_fmt = &pipe->configs[i].out_fmt;
		next_fmt = &pipe->configs[i + 1].out_fmt;
		} else {
		cur_fmt = &pipe->configs[i].in_fmt;
		next_fmt = &pipe->configs[i + 1].in_fmt;
		}

		if (!CHECK_HW_PARAMS(cur_fmt->channels, cur_fmt->freq,
		cur_fmt->bps,
		next_fmt->channels,
		next_fmt->freq,
		next_fmt->bps))
		return true;
		}

		return false;
		}

		/*
		* Here, we select pipe format based on the pipe type and pipe
		* direction to determine the current config index for the pipeline.
		@@ -601,6 +633,14 @@ skl_tplg_get_pipe_config(struct skl_dev skl, struct skl_module_cfg mconfig)
		return 0;
		}

		if (skl_tplg_is_multi_fmt(skl, pipe)) {
		pipe->cur_config_idx = pipe->pipe_config_idx;
		pipe->memory_pages = pconfig->mem_pages;
		dev_dbg(skl->dev, "found pipe config idx:%d\n",
		pipe->cur_config_idx);
		return 0;
		}

		if (pipe->conn_type == SKL_PIPE_CONN_TYPE_NONE) {
		dev_dbg(skl->dev, "No conn_type detected, take 0th config\n");
		pipe->cur_config_idx = 0;
		@@ -1315,6 +1355,56 @@ static int skl_tplg_pga_event(struct snd_soc_dapm_widget *w,
		return 0;
		}

		static int skl_tplg_multi_config_set_get(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol,
		bool is_set)
		{
		struct snd_soc_component *component =
		snd_soc_kcontrol_component(kcontrol);
		struct hdac_bus *bus = snd_soc_component_get_drvdata(component);
		struct skl_dev *skl = bus_to_skl(bus);
		struct skl_pipeline *ppl;
		struct skl_pipe *pipe = NULL;
		struct soc_enum ec = (struct soc_enum )kcontrol->private_value;
		u32 *pipe_id;

		if (!ec)
		return -EINVAL;

		if (is_set && ucontrol->value.enumerated.item[0] > ec->items)
		return -EINVAL;

		pipe_id = ec->dobj.private;

		list_for_each_entry(ppl, &skl->ppl_list, node) {
		if (ppl->pipe->ppl_id == *pipe_id) {
		pipe = ppl->pipe;
		break;
		}
		}
		if (!pipe)
		return -EIO;

		if (is_set)
		pipe->pipe_config_idx = ucontrol->value.enumerated.item[0];
		else
		ucontrol->value.enumerated.item[0] = pipe->pipe_config_idx;

		return 0;
		}

		static int skl_tplg_multi_config_get(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		return skl_tplg_multi_config_set_get(kcontrol, ucontrol, false);
		}

		static int skl_tplg_multi_config_set(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		return skl_tplg_multi_config_set_get(kcontrol, ucontrol, true);
		}

		static int skl_tplg_tlv_control_get(struct snd_kcontrol *kcontrol,
		unsigned int __user *data, unsigned int size)
		{
		@@ -1854,6 +1944,11 @@ static const struct snd_soc_tplg_kcontrol_ops skl_tplg_kcontrol_ops[] = {
		.get = skl_tplg_mic_control_get,
		.put = skl_tplg_mic_control_set,
		},
		{
		.id = SKL_CONTROL_TYPE_MULTI_IO_SELECT,
		.get = skl_tplg_multi_config_get,
		.put = skl_tplg_multi_config_set,
		},
		};

		static int skl_tplg_fill_pipe_cfg(struct device *dev,

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -306,6 +306,7 @@ struct skl_pipe {
		struct skl_path_config configs[SKL_MAX_PATH_CONFIGS];
		struct list_head w_list;
		bool passthru;
		u32 pipe_config_idx;
		};

		enum skl_module_state {

Admin message