From: Cezary Rojewski <cezary.rojewski@intel.com>
To: alsa-devel@alsa-project.org, broonie@kernel.org
Cc: Cezary Rojewski <cezary.rojewski@intel.com>,
upstream@semihalf.com, harshapriya.n@intel.com, rad@semihalf.com,
pierre-louis.bossart@linux.intel.com, tiwai@suse.com,
hdegoede@redhat.com, amadeuszx.slawinski@linux.intel.com,
cujomalainey@chromium.org, lma@semihalf.com
Subject: [PATCH v2 13/14] ASoC: Intel: avs: Prepare modules before bindings them
Date: Thu, 31 Mar 2022 15:52:45 +0200 [thread overview]
Message-ID: <20220331135246.993089-14-cezary.rojewski@intel.com> (raw)
In-Reply-To: <20220331135246.993089-1-cezary.rojewski@intel.com>
When binding modules to pins other than pin0, sometimes additional
preparations need to be made, depending on the module type.
Add function that prepares modules when necessary before binding them.
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
---
sound/soc/intel/avs/path.c | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/sound/soc/intel/avs/path.c b/sound/soc/intel/avs/path.c
index 13006c24ebf8..916a4f25636e 100644
--- a/sound/soc/intel/avs/path.c
+++ b/sound/soc/intel/avs/path.c
@@ -463,6 +463,37 @@ struct avs_path *avs_path_create(struct avs_dev *adev, u32 dma_id,
return path;
}
+static int avs_path_bind_prepare(struct avs_dev *adev,
+ struct avs_path_binding *binding)
+{
+ const struct avs_audio_format *src_fmt, *sink_fmt;
+ struct avs_tplg_module *tsource = binding->source->template;
+ struct avs_path_module *source = binding->source;
+ int ret;
+
+ /*
+ * only copier modules about to be bound
+ * to output pin other than 0 need preparation
+ */
+ if (!binding->source_pin)
+ return 0;
+ if (!guid_equal(&tsource->cfg_ext->type, &AVS_COPIER_MOD_UUID))
+ return 0;
+
+ src_fmt = tsource->in_fmt;
+ sink_fmt = binding->sink->template->in_fmt;
+
+ ret = avs_ipc_copier_set_sink_format(adev, source->module_id,
+ source->instance_id, binding->source_pin,
+ src_fmt, sink_fmt);
+ if (ret) {
+ dev_err(adev->dev, "config copier failed: %d\n", ret);
+ return AVS_IPC_RET(ret);
+ }
+
+ return 0;
+}
+
int avs_path_bind(struct avs_path *path)
{
struct avs_path_pipeline *ppl;
@@ -478,6 +509,10 @@ int avs_path_bind(struct avs_path *path)
source = binding->source;
sink = binding->sink;
+ ret = avs_path_bind_prepare(adev, binding);
+ if (ret < 0)
+ return ret;
+
ret = avs_ipc_bind(adev, source->module_id,
source->instance_id, sink->module_id,
sink->instance_id, binding->sink_pin,
--
2.25.1
next prev parent reply other threads:[~2022-03-31 13:47 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-31 13:52 [PATCH v2 00/14] ASoC: Intel: avs: Topology and path management Cezary Rojewski
2022-03-31 13:52 ` [PATCH v2 01/14] ASoC: Intel: avs: Declare vendor tokens Cezary Rojewski
2022-03-31 13:52 ` [PATCH v2 02/14] ASoC: Intel: avs: Add topology parsing infrastructure Cezary Rojewski
2022-06-09 19:57 ` Pierre-Louis Bossart
2022-06-10 10:01 ` Cezary Rojewski
2022-03-31 13:52 ` [PATCH v2 03/14] ASoC: Intel: avs: Parse module-extension tuples Cezary Rojewski
2022-03-31 13:52 ` [PATCH v2 04/14] ASoC: Intel: avs: Parse pplcfg and binding tuples Cezary Rojewski
2022-03-31 13:52 ` [PATCH v2 05/14] ASoC: Intel: avs: Parse pipeline and module tuples Cezary Rojewski
2022-03-31 13:52 ` [PATCH v2 06/14] ASoC: Intel: avs: Parse path and path templates tuples Cezary Rojewski
2022-03-31 13:52 ` [PATCH v2 07/14] ASoC: Intel: avs: Add topology loading operations Cezary Rojewski
2022-03-31 13:52 ` [PATCH v2 08/14] ASoC: Intel: avs: Support link_mask formatted string Cezary Rojewski
2022-03-31 13:52 ` [PATCH v2 09/14] ASoC: Intel: avs: Declare path and its components Cezary Rojewski
2022-03-31 13:52 ` [PATCH v2 10/14] ASoC: Intel: avs: Path creation and freeing Cezary Rojewski
2022-03-31 13:52 ` [PATCH v2 11/14] ASoC: Intel: avs: Path state management Cezary Rojewski
2022-03-31 13:52 ` [PATCH v2 12/14] ASoC: Intel: avs: Arm paths after creating them Cezary Rojewski
2022-03-31 13:52 ` Cezary Rojewski [this message]
2022-03-31 13:52 ` [PATCH v2 14/14] ASoC: Intel: avs: Configure modules according to their type Cezary Rojewski
2022-04-08 10:54 ` [PATCH v2 00/14] ASoC: Intel: avs: Topology and path management Cezary Rojewski
2022-04-08 11:16 ` Mark Brown
2022-04-20 21:40 ` 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=20220331135246.993089-14-cezary.rojewski@intel.com \
--to=cezary.rojewski@intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=amadeuszx.slawinski@linux.intel.com \
--cc=broonie@kernel.org \
--cc=cujomalainey@chromium.org \
--cc=harshapriya.n@intel.com \
--cc=hdegoede@redhat.com \
--cc=lma@semihalf.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=rad@semihalf.com \
--cc=tiwai@suse.com \
--cc=upstream@semihalf.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