Unverified Commit 049307aa authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: Add enum_get/put control ops for IPC3 



Define and set the enum_get/put control IPC ops for IPC3.

Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220317175044.1752400-9-ranjani.sridharan@linux.intel.com


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

sound/soc/sof/control.c

+12 −27
Original line number Diff line number Diff line
@@ -160,17 +160,14 @@ int snd_sof_switch_put(struct snd_kcontrol *kcontrol, 
int snd_sof_enum_get(struct snd_kcontrol *kcontrol,

		     struct snd_ctl_elem_value *ucontrol)

{

	struct soc_enum *se =

		(struct soc_enum *)kcontrol->private_value;

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

	struct snd_sof_control *scontrol = se->dobj.private;

	struct sof_ipc_ctrl_data *cdata = scontrol->ipc_control_data;

	unsigned int i, channels = scontrol->num_channels;



	snd_sof_refresh_control(scontrol);

	struct snd_soc_component *scomp = scontrol->scomp;

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);

	const struct sof_ipc_tplg_ops *tplg_ops = sdev->ipc->ops->tplg;



	/* read back each channel */

	for (i = 0; i < channels; i++)

		ucontrol->value.enumerated.item[i] = cdata->chanv[i].value;

	if (tplg_ops->control->enum_get)

		return tplg_ops->control->enum_get(scontrol, ucontrol);



	return 0;

}
@@ -178,28 +175,16 @@ int snd_sof_enum_get(struct snd_kcontrol *kcontrol, 
int snd_sof_enum_put(struct snd_kcontrol *kcontrol,

		     struct snd_ctl_elem_value *ucontrol)

{

	struct soc_enum *se =

		(struct soc_enum *)kcontrol->private_value;

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

	struct snd_sof_control *scontrol = se->dobj.private;

	struct snd_soc_component *scomp = scontrol->scomp;

	struct sof_ipc_ctrl_data *cdata = scontrol->ipc_control_data;

	unsigned int i, channels = scontrol->num_channels;

	bool change = false;

	u32 value;

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);

	const struct sof_ipc_tplg_ops *tplg_ops = sdev->ipc->ops->tplg;



	/* update each channel */

	for (i = 0; i < channels; i++) {

		value = ucontrol->value.enumerated.item[i];

		change = change || (value != cdata->chanv[i].value);

		cdata->chanv[i].channel = i;

		cdata->chanv[i].value = value;

	}

	if (tplg_ops->control->enum_put)

		return tplg_ops->control->enum_put(scontrol, ucontrol);



	/* notify DSP of enum updates */

	if (pm_runtime_active(scomp->dev))

		snd_sof_ipc_set_get_comp_data(scontrol, true);



	return change;

	return false;

}



int snd_sof_bytes_get(struct snd_kcontrol *kcontrol,

sound/soc/sof/ipc3-control.c

+50 −0
Original line number Diff line number Diff line
@@ -157,6 +157,54 @@ static bool sof_ipc3_switch_put(struct snd_sof_control *scontrol, 
	return change;

}



static int sof_ipc3_enum_get(struct snd_sof_control *scontrol,

			     struct snd_ctl_elem_value *ucontrol)

{

	struct sof_ipc_ctrl_data *cdata = scontrol->ipc_control_data;

	unsigned int channels = scontrol->num_channels;

	unsigned int i;



	snd_sof_refresh_control(scontrol);



	/* read back each channel */

	for (i = 0; i < channels; i++)

		ucontrol->value.enumerated.item[i] = cdata->chanv[i].value;



	return 0;

}



static bool sof_ipc3_enum_put(struct snd_sof_control *scontrol,

			      struct snd_ctl_elem_value *ucontrol)

{

	struct sof_ipc_ctrl_data *cdata = scontrol->ipc_control_data;

	struct snd_soc_component *scomp = scontrol->scomp;

	unsigned int channels = scontrol->num_channels;

	unsigned int i;

	bool change = false;

	u32 value;



	/* update each channel */

	for (i = 0; i < channels; i++) {

		value = ucontrol->value.enumerated.item[i];

		change = change || (value != cdata->chanv[i].value);

		cdata->chanv[i].channel = i;

		cdata->chanv[i].value = value;

	}



	/* notify DSP of enum updates */

	if (pm_runtime_active(scomp->dev)) {

		int ret = snd_sof_ipc_set_get_comp_data(scontrol, true);



		if (ret < 0) {

			dev_err(scomp->dev, "Failed to set enum updates for %s\n",

				scontrol->name);

			return false;

		}

	}



	return change;

}



static void snd_sof_update_control(struct snd_sof_control *scontrol,

				   struct sof_ipc_ctrl_data *cdata)

{
@@ -302,5 +350,7 @@ const struct sof_ipc_tplg_control_ops tplg_ipc3_control_ops = { 
	.volume_get = sof_ipc3_volume_get,

	.switch_put = sof_ipc3_switch_put,

	.switch_get = sof_ipc3_switch_get,

	.enum_put = sof_ipc3_enum_put,

	.enum_get = sof_ipc3_enum_get,

	.update = sof_ipc3_control_update,

};