alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: jeeja.kp@intel.com
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, patches.audio@intel.com, broonie@kernel.org,
	liam.r.girdwood@intel.com, Jeeja KP <jeeja.kp@intel.com>
Subject: [PATCH v4 7/9] ASoC: Intel: Skylake: Don't reset pass-through pipe in BE prepare
Date: Mon,  2 Jan 2017 12:44:34 +0530	[thread overview]
Message-ID: <1483341277-14475-8-git-send-email-jeeja.kp@intel.com> (raw)
In-Reply-To: <1483341277-14475-1-git-send-email-jeeja.kp@intel.com>

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

When pipe is pass-through, BE and FE modules are defined inside
a pipe, reset of pipe will be done in FE DAI prepare. So don't
reset in the BE prepare.

Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
---
 sound/soc/intel/skylake/skl-pcm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c
index 688d6f7..800fdad 100644
--- a/sound/soc/intel/skylake/skl-pcm.c
+++ b/sound/soc/intel/skylake/skl-pcm.c
@@ -582,8 +582,8 @@ static int skl_link_pcm_prepare(struct snd_pcm_substream *substream,
 
 	/* In case of XRUN recovery, reset the FW pipe to clean state */
 	mconfig = skl_tplg_be_get_cpr_module(dai, substream->stream);
-	if (mconfig && (substream->runtime->status->state ==
-					SNDRV_PCM_STATE_XRUN))
+	if (mconfig && !mconfig->pipe->passthru &&
+		(substream->runtime->status->state == SNDRV_PCM_STATE_XRUN))
 		skl_reset_pipe(skl->skl_sst, mconfig->pipe);
 
 	return 0;
-- 
2.5.0

  parent reply	other threads:[~2017-01-02  7:04 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-02  7:14 [PATCH v4 0/9] ASoC: Intel: Skylake: Driver updates jeeja.kp
2017-01-02  7:14 ` [PATCH v4 1/9] ALSA: hda: check stream decoupled register state jeeja.kp
2017-01-02  7:14 ` [PATCH v4 2/9] ASoC: Intel: Skylake: Add set_tristate DAI ops to enable SSP MCLK jeeja.kp
2017-01-06 18:32   ` Mark Brown
2017-01-10  9:31     ` Jeeja KP
2017-01-02  7:14 ` [PATCH v4 3/9] ASoC: Intel: Skylake: Remove unused SSP BE prepare DAI ops jeeja.kp
2017-01-02  7:14 ` [PATCH v4 4/9] ASoC: Intel: Skylake: Add supply widget as non DSP widget jeeja.kp
2017-01-02  7:14 ` [PATCH v4 5/9] ASoC: Intel: Skylake: Add supply widget in skl_nau_max machine jeeja.kp
2017-01-02  7:14 ` [PATCH v4 6/9] ASoC: Intel: Skylake: Add supply widget in bxt_da_max machine jeeja.kp
2017-01-06 18:34   ` Mark Brown
2017-01-02  7:14 ` jeeja.kp [this message]
2017-01-02  7:14 ` [PATCH v4 8/9] ASoC: Intel: Skylake: set the resume point to LPIB jeeja.kp
2017-01-02  7:14 ` [PATCH v4 9/9] ASoC: hdac_hdmi: Enable pin and converter in prepare jeeja.kp
2017-01-19 18:03   ` Applied "ASoC: hdac_hdmi: Enable pin and converter in prepare" to the asoc tree Mark Brown
2017-01-02 10:01 ` [PATCH v4 0/9] ASoC: Intel: Skylake: Driver updates Vinod Koul

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=1483341277-14475-8-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=tiwai@suse.de \
    /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).