Unverified Commit 2d744ecf authored by Mateusz Gorski's avatar Mateusz Gorski Committed by Mark Brown
Browse files

ASoC: Intel: Skylake: Automatic DMIC format configuration according to information from NHLT 



Automatically choose DMIC pipeline format configuration depending on
information included in NHLT.
Change the access rights of appropriate kcontrols to read-only in order
to prevent user interference.

Signed-off-by: default avatarMateusz Gorski <mateusz.gorski@linux.intel.com>
Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200427132727.24942-4-mateusz.gorski@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1b450791

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

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#define SKL_CONTROL_TYPE_BYTE_TLV	0x100

#define SKL_CONTROL_TYPE_MIC_SELECT	0x102

#define SKL_CONTROL_TYPE_MULTI_IO_SELECT	0x103

#define SKL_CONTROL_TYPE_MULTI_IO_SELECT_DMIC	0x104



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

#define MAX_IN_QUEUE 8

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

+61 −3
Original line number Diff line number Diff line
@@ -1405,6 +1405,18 @@ static int skl_tplg_multi_config_set(struct snd_kcontrol *kcontrol, 
	return skl_tplg_multi_config_set_get(kcontrol, ucontrol, true);

}



static int skl_tplg_multi_config_get_dmic(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_dmic(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)

{
@@ -1949,6 +1961,11 @@ static const struct snd_soc_tplg_kcontrol_ops skl_tplg_kcontrol_ops[] = { 
		.get = skl_tplg_multi_config_get,

		.put = skl_tplg_multi_config_set,

	},

	{

		.id = SKL_CONTROL_TYPE_MULTI_IO_SELECT_DMIC,

		.get = skl_tplg_multi_config_get_dmic,

		.put = skl_tplg_multi_config_set_dmic,

	}

};



static int skl_tplg_fill_pipe_cfg(struct device *dev,
@@ -3109,12 +3126,21 @@ static int skl_tplg_control_load(struct snd_soc_component *cmpnt, 
	case SND_SOC_TPLG_CTL_ENUM:

		tplg_ec = container_of(hdr,

				struct snd_soc_tplg_enum_control, hdr);

		if (kctl->access & SNDRV_CTL_ELEM_ACCESS_READWRITE) {

		if (kctl->access & SNDRV_CTL_ELEM_ACCESS_READ) {

			se = (struct soc_enum *)kctl->private_value;

			if (tplg_ec->priv.size)

				return skl_init_enum_data(bus->dev, se,

						tplg_ec);

				skl_init_enum_data(bus->dev, se, tplg_ec);

		}



		/*

		 * now that the control initializations are done, remove

		 * write permission for the DMIC configuration enums to

		 * avoid conflicts between NHLT settings and user interaction

		 */



		if (hdr->ops.get == SKL_CONTROL_TYPE_MULTI_IO_SELECT_DMIC)

			kctl->access = SNDRV_CTL_ELEM_ACCESS_READ;



		break;



	default:
@@ -3584,6 +3610,37 @@ static int skl_manifest_load(struct snd_soc_component *cmpnt, int index, 
	return 0;

}



static void skl_tplg_complete(struct snd_soc_component *component)

{

	struct snd_soc_dobj *dobj;

	struct snd_soc_acpi_mach *mach =

		dev_get_platdata(component->card->dev);

	int i;



	list_for_each_entry(dobj, &component->dobj_list, list) {

		struct snd_kcontrol *kcontrol = dobj->control.kcontrol;

		struct soc_enum *se =

			(struct soc_enum *)kcontrol->private_value;

		char **texts = dobj->control.dtexts;

		char chan_text[4];



		if (dobj->type != SND_SOC_DOBJ_ENUM ||

		    dobj->control.kcontrol->put !=

		    skl_tplg_multi_config_set_dmic)

			continue;

		sprintf(chan_text, "c%d", mach->mach_params.dmic_num);



		for (i = 0; i < se->items; i++) {

			struct snd_ctl_elem_value val;



			if (strstr(texts[i], chan_text)) {

				val.value.enumerated.item[0] = i;

				kcontrol->put(kcontrol, &val);

			}

		}

	}

}



static struct snd_soc_tplg_ops skl_tplg_ops  = {

	.widget_load = skl_tplg_widget_load,

	.control_load = skl_tplg_control_load,
@@ -3593,6 +3650,7 @@ static struct snd_soc_tplg_ops skl_tplg_ops = { 
	.io_ops_count = ARRAY_SIZE(skl_tplg_kcontrol_ops),

	.manifest = skl_manifest_load,

	.dai_load = skl_dai_load,

	.complete = skl_tplg_complete,

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE