Commit 9fed9d91 authored by Keyon Jie's avatar Keyon Jie Committed by Mark Brown

ASoC: SOF: append extended data to sof_ipc_comp_volume

Append the extended data to the end of the struct sof_ipc_comp_volume,
construct the ipc for COMP_NEW during the topology load stage.
Signed-off-by: default avatarKeyon Jie <yang.jie@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200904132744.1699575-10-kai.vehmanen@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent f375bb33
...@@ -1878,11 +1878,13 @@ static int sof_widget_load_pga(struct snd_soc_component *scomp, int index, ...@@ -1878,11 +1878,13 @@ static int sof_widget_load_pga(struct snd_soc_component *scomp, int index,
struct snd_soc_tplg_private *private = &tw->priv; struct snd_soc_tplg_private *private = &tw->priv;
struct sof_ipc_comp_volume *volume; struct sof_ipc_comp_volume *volume;
struct snd_sof_control *scontrol; struct snd_sof_control *scontrol;
size_t ipc_size = sizeof(*volume);
int min_step; int min_step;
int max_step; int max_step;
int ret; int ret;
volume = kzalloc(sizeof(*volume), GFP_KERNEL); volume = (struct sof_ipc_comp_volume *)
sof_comp_alloc(swidget, &ipc_size, index, core);
if (!volume) if (!volume)
return -ENOMEM; return -ENOMEM;
...@@ -1894,12 +1896,7 @@ static int sof_widget_load_pga(struct snd_soc_component *scomp, int index, ...@@ -1894,12 +1896,7 @@ static int sof_widget_load_pga(struct snd_soc_component *scomp, int index,
} }
/* configure volume IPC message */ /* configure volume IPC message */
volume->comp.hdr.size = sizeof(*volume);
volume->comp.hdr.cmd = SOF_IPC_GLB_TPLG_MSG | SOF_IPC_TPLG_COMP_NEW;
volume->comp.id = swidget->comp_id;
volume->comp.type = SOF_COMP_VOLUME; volume->comp.type = SOF_COMP_VOLUME;
volume->comp.pipeline_id = index;
volume->comp.core = core;
volume->config.hdr.size = sizeof(volume->config); volume->config.hdr.size = sizeof(volume->config);
ret = sof_parse_tokens(scomp, volume, volume_tokens, ret = sof_parse_tokens(scomp, volume, volume_tokens,
...@@ -1936,7 +1933,7 @@ static int sof_widget_load_pga(struct snd_soc_component *scomp, int index, ...@@ -1936,7 +1933,7 @@ static int sof_widget_load_pga(struct snd_soc_component *scomp, int index,
} }
ret = sof_ipc_tx_message(sdev->ipc, volume->comp.hdr.cmd, volume, ret = sof_ipc_tx_message(sdev->ipc, volume->comp.hdr.cmd, volume,
sizeof(*volume), r, sizeof(*r)); ipc_size, r, sizeof(*r));
if (ret >= 0) if (ret >= 0)
return ret; return ret;
err: err:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment