alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: jeeja.kp@intel.com
To: alsa-devel@alsa-project.org
Cc: patches.audio@intel.com, Jeeja KP <jeeja.kp@intel.com>,
	broonie@kernel.org, Vinod Koul <vinod.koul@intel.com>,
	liam.r.girdwood@intel.com
Subject: [PATCH 08/10] ASoC: Intel: Skylake: Set the DSP pipe type
Date: Fri,  3 Jun 2016 18:29:41 +0530	[thread overview]
Message-ID: <1464958783-19344-9-git-send-email-jeeja.kp@intel.com> (raw)
In-Reply-To: <1464958783-19344-1-git-send-email-jeeja.kp@intel.com>

From: Jeeja KP <jeeja.kp@intel.com>

DSP pipe type can be a pass through or it can be processing pipe.
In case of pass through pipe, it is a single pipeline with both
host and link copier in the same pipeline.

Identify the DSP pipe type if it pass through or not. Pass through
pipe is identified by checking if it has both host and link copier
in the same pipeline.

Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
 sound/soc/intel/skylake/skl-topology.c | 27 +++++++++++++++++++++++++++
 sound/soc/intel/skylake/skl-topology.h |  1 +
 2 files changed, 28 insertions(+)

diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index 761dfc4..2f1991d 100644
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -1769,6 +1769,29 @@ static int skl_tplg_create_pipe_widget_list(struct snd_soc_platform *platform)
 	return 0;
 }
 
+static void skl_tplg_set_pipe_type(struct skl *skl, struct skl_pipe *pipe)
+{
+	struct skl_pipe_module *w_module;
+	struct snd_soc_dapm_widget *w;
+	struct skl_module_cfg *mconfig;
+	bool host_found = false, link_found = false;
+
+	list_for_each_entry(w_module, &pipe->w_list, node) {
+		w = w_module->w;
+		mconfig = w->priv;
+
+		if (mconfig->dev_type == SKL_DEVICE_HDAHOST)
+			host_found = true;
+		else if (mconfig->dev_type != SKL_DEVICE_NONE)
+			link_found = true;
+	}
+
+	if (host_found && link_found)
+		pipe->passthru = true;
+	else
+		pipe->passthru = false;
+}
+
 /* This will be read from topology manifest, currently defined here */
 #define SKL_MAX_MCPS 30000000
 #define SKL_FW_MAX_MEM 1000000
@@ -1782,6 +1805,7 @@ int skl_tplg_init(struct snd_soc_platform *platform, struct hdac_ext_bus *ebus)
 	const struct firmware *fw;
 	struct hdac_bus *bus = ebus_to_hbus(ebus);
 	struct skl *skl = ebus_to_skl(ebus);
+	struct skl_pipeline *ppl;
 
 	ret = request_firmware(&fw, skl->tplg_name, bus->dev);
 	if (ret < 0) {
@@ -1815,5 +1839,8 @@ int skl_tplg_init(struct snd_soc_platform *platform, struct hdac_ext_bus *ebus)
 	if (ret < 0)
 		return ret;
 
+	list_for_each_entry(ppl, &skl->ppl_list, node)
+		skl_tplg_set_pipe_type(skl, ppl->pipe);
+
 	return 0;
 }
diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h
index d4a58bc..170d68b 100644
--- a/sound/soc/intel/skylake/skl-topology.h
+++ b/sound/soc/intel/skylake/skl-topology.h
@@ -271,6 +271,7 @@ struct skl_pipe {
 	struct skl_pipe_params *p_params;
 	enum skl_pipe_state state;
 	struct list_head w_list;
+	bool passthru;
 };
 
 enum skl_module_state {
-- 
2.5.0

  parent reply	other threads:[~2016-06-03 12:56 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-03 12:59 [PATCH 00/10] ASoC: Intel: Skylake: Improvements in Skylake driver jeeja.kp
2016-06-03 12:59 ` [PATCH 01/10] ASoC: Intel: Skylake: Reset DSP pipe when host/link DMA is reset jeeja.kp
2016-06-07 13:27   ` Applied "ASoC: Intel: Skylake: Reset DSP pipe when host/link DMA is reset" to the asoc tree Mark Brown
2016-06-03 12:59 ` [PATCH 02/10] ASoC: Intel: Skylake: Set the pipe state to paused when paused jeeja.kp
2016-06-07 12:56   ` Mark Brown
2016-06-08  9:39     ` Jeeja KP
2016-06-07 13:27   ` Applied "ASoC: Intel: Skylake: Set the pipe state to paused when paused" to the asoc tree Mark Brown
2016-06-03 12:59 ` [PATCH 03/10] ASoC: Intel: Skylake: Don't pause stopped pipeline while deleting jeeja.kp
2016-06-07 13:27   ` Applied "ASoC: Intel: Skylake: Don't pause stopped pipeline while deleting" to the asoc tree Mark Brown
2016-06-03 12:59 ` [PATCH 04/10] ASoC: Intel: Skylake: Disable SRAM Retention before D3 jeeja.kp
2016-06-03 13:04   ` Takashi Iwai
2016-06-03 16:15     ` Ughreja, Rakesh A
2016-06-07 13:27   ` Applied "ASoC: Intel: Skylake: Disable SRAM Retention before D3" to the asoc tree Mark Brown
2016-06-03 12:59 ` [PATCH 05/10] ASoC: Intel: Skylake: Avoid freeing up of unallocated memory/mcps jeeja.kp
2016-06-07 13:27   ` Applied "ASoC: Intel: Skylake: Avoid freeing up of unallocated memory/mcps" to the asoc tree Mark Brown
2016-06-03 12:59 ` [PATCH 06/10] ASoC: Intel: Skylake: Clean up of driver resources in suspend jeeja.kp
2016-06-07 13:27   ` Applied "ASoC: Intel: Skylake: Clean up of driver resources in suspend" to the asoc tree Mark Brown
2016-06-03 12:59 ` [PATCH 07/10] ASoC: Intel: Skylake: Create Pipe to widget list in soc probe jeeja.kp
2016-06-07 13:27   ` Applied "ASoC: Intel: Skylake: Create Pipe to widget list in soc probe" to the asoc tree Mark Brown
2016-06-03 12:59 ` jeeja.kp [this message]
2016-06-07 13:27   ` Applied "ASoC: Intel: Skylake: Set the DSP pipe type" " Mark Brown
2016-06-03 12:59 ` [PATCH 09/10] ASoC: Intel: Skylake: Copy the pipe parameter by pipe type jeeja.kp
2016-06-07 13:27   ` Applied "ASoC: Intel: Skylake: Copy the pipe parameter by pipe type" to the asoc tree Mark Brown
2016-06-03 12:59 ` [PATCH 10/10] ASoC: Intel: Skylake: Report position in pointer query jeeja.kp
2016-06-07 13:27   ` Applied "ASoC: Intel: Skylake: Report position in pointer query" to the asoc tree 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=1464958783-19344-9-git-send-email-jeeja.kp@intel.com \
    --to=jeeja.kp@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=liam.r.girdwood@intel.com \
    --cc=patches.audio@intel.com \
    --cc=vinod.koul@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).