From: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
To: lgirdwood@gmail.com, broonie@kernel.org,
pierre-louis.bossart@linux.intel.com, daniel.baluta@nxp.com
Cc: guennadi.liakhovetski@linux.intel.com,
alsa-devel@alsa-project.org, seppo.ingalsuo@intel.com,
ranjani.sridharan@linux.intel.com, kai.vehmanen@linux.intel.com
Subject: [PATCH v3 07/12] ASoC: SOF: restore kcontrols for widget during set up
Date: Mon, 27 Sep 2021 15:05:12 +0300 [thread overview]
Message-ID: <20210927120517.20505-8-peter.ujfalusi@linux.intel.com> (raw)
In-Reply-To: <20210927120517.20505-1-peter.ujfalusi@linux.intel.com>
From: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Restore kcontrols for each widget after it has been set up
successfully.
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Seppo Ingalsuo <seppo.ingalsuo@intel.com>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
---
sound/soc/sof/sof-audio.c | 59 ++++++++++++++++++++++-----------------
1 file changed, 33 insertions(+), 26 deletions(-)
diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c
index b52a453ae9d7..b27760208a4b 100644
--- a/sound/soc/sof/sof-audio.c
+++ b/sound/soc/sof/sof-audio.c
@@ -64,6 +64,25 @@ static int sof_dai_config_setup(struct snd_sof_dev *sdev, struct snd_sof_dai *da
return ret;
}
+static int sof_widget_kcontrol_setup(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget)
+{
+ struct snd_sof_control *scontrol;
+ int ret;
+
+ /* set up all controls for the widget */
+ list_for_each_entry(scontrol, &sdev->kcontrol_list, list)
+ if (scontrol->comp_id == swidget->comp_id) {
+ ret = sof_kcontrol_setup(sdev, scontrol);
+ if (ret < 0) {
+ dev_err(sdev->dev, "error: fail to set up kcontrols for widget %s\n",
+ swidget->widget->name);
+ return ret;
+ }
+ }
+
+ return 0;
+}
+
static int sof_widget_setup(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget)
{
struct sof_ipc_pipe_new *pipeline;
@@ -113,10 +132,20 @@ static int sof_widget_setup(struct snd_sof_dev *sdev, struct snd_sof_widget *swi
&r, sizeof(r));
break;
}
- if (ret < 0)
+ if (ret < 0) {
dev_err(sdev->dev, "error: failed to load widget %s\n", swidget->widget->name);
- else
- dev_dbg(sdev->dev, "widget %s setup complete\n", swidget->widget->name);
+ return ret;
+ }
+
+ /* restore kcontrols for widget */
+ ret = sof_widget_kcontrol_setup(sdev, swidget);
+ if (ret < 0) {
+ dev_err(sdev->dev, "error: failed to restore kcontrols for widget %s\n",
+ swidget->widget->name);
+ return ret;
+ }
+
+ dev_dbg(sdev->dev, "widget %s setup complete\n", swidget->widget->name);
return ret;
}
@@ -203,22 +232,6 @@ int sof_set_hw_params_upon_resume(struct device *dev)
return snd_sof_dsp_hw_params_upon_resume(sdev);
}
-static int sof_restore_kcontrols(struct device *dev)
-{
- struct snd_sof_dev *sdev = dev_get_drvdata(dev);
- struct snd_sof_control *scontrol;
- int ret = 0;
-
- /* restore kcontrol values */
- list_for_each_entry(scontrol, &sdev->kcontrol_list, list) {
- ret = sof_kcontrol_setup(sdev, scontrol);
- if (ret < 0)
- return ret;
- }
-
- return 0;
-}
-
const struct sof_ipc_pipe_new *snd_sof_pipeline_find(struct snd_sof_dev *sdev,
int pipeline_id)
{
@@ -309,13 +322,7 @@ int sof_restore_pipelines(struct device *dev)
}
}
- /* restore pipeline kcontrols */
- ret = sof_restore_kcontrols(dev);
- if (ret < 0)
- dev_err(dev,
- "error: restoring kcontrols after resume\n");
-
- return ret;
+ return 0;
}
/* This function doesn't free widgets. It only resets the set up status for all routes */
--
2.33.0
next prev parent reply other threads:[~2021-09-27 12:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-27 12:05 [PATCH v3 00/12] Add support for on demand pipeline setup/destroy Peter Ujfalusi
2021-09-27 12:05 ` [PATCH v3 01/12] ASoC: topology: change the complete op in snd_soc_tplg_ops to return int Peter Ujfalusi
2021-09-27 12:05 ` [PATCH v3 02/12] ASoC: SOF: control: Add access field in struct snd_sof_control Peter Ujfalusi
2021-09-27 12:05 ` [PATCH v3 03/12] ASoC: SOF: topology: Add new token for dynamic pipeline Peter Ujfalusi
2021-09-27 12:05 ` [PATCH v3 04/12] ASoC: SOF: sof-audio: add helpers for widgets, kcontrols and dai config set up Peter Ujfalusi
2021-09-27 12:05 ` [PATCH v3 05/12] AsoC: dapm: export a couple of functions Peter Ujfalusi
2021-09-27 12:05 ` [PATCH v3 06/12] ASoC: SOF: Add new fields to snd_sof_route Peter Ujfalusi
2021-09-27 12:05 ` Peter Ujfalusi [this message]
2021-09-27 12:05 ` [PATCH v3 08/12] ASoC: SOF: Don't set up widgets during topology parsing Peter Ujfalusi
2021-09-27 12:05 ` [PATCH v3 09/12] ASoC: SOF: Introduce widget use_count Peter Ujfalusi
2021-09-27 12:05 ` [PATCH v3 10/12] ASoC: SOF: Intel: hda: make sure DAI widget is set up before IPC Peter Ujfalusi
2021-09-27 12:05 ` [PATCH v3 11/12] ASoC: SOF: Add support for dynamic pipelines Peter Ujfalusi
2021-09-27 12:05 ` [PATCH v3 12/12] ASoC: SOF: topology: Add kernel parameter for topology verification Peter Ujfalusi
2021-10-02 0:16 ` [PATCH v3 00/12] Add support for on demand pipeline setup/destroy Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210927120517.20505-8-peter.ujfalusi@linux.intel.com \
--to=peter.ujfalusi@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=daniel.baluta@nxp.com \
--cc=guennadi.liakhovetski@linux.intel.com \
--cc=kai.vehmanen@linux.intel.com \
--cc=lgirdwood@gmail.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=seppo.ingalsuo@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).