From: Cezary Rojewski <cezary.rojewski@intel.com>
To: broonie@kernel.org
Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org,
tiwai@suse.com, perex@perex.cz,
amadeuszx.slawinski@linux.intel.com, hdegoede@redhat.com,
Cezary Rojewski <cezary.rojewski@intel.com>
Subject: [PATCH 01/13] ASoC: Intel: avs: Restore stream decoupling on prepare
Date: Fri, 5 Apr 2024 11:09:17 +0200 [thread overview]
Message-ID: <20240405090929.1184068-2-cezary.rojewski@intel.com> (raw)
In-Reply-To: <20240405090929.1184068-1-cezary.rojewski@intel.com>
From: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Revert changes from commit b87b8f43afd5 ("ASoC: Intel: avs: Drop
superfluous stream decoupling") to restore working streaming during S3.
Fixes: b87b8f43afd5 ("ASoC: Intel: avs: Drop superfluous stream decoupling")
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/pcm.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c
index 2cafbc392cdb..72f1bc3b7b1f 100644
--- a/sound/soc/intel/avs/pcm.c
+++ b/sound/soc/intel/avs/pcm.c
@@ -356,6 +356,7 @@ static int avs_dai_hda_be_prepare(struct snd_pcm_substream *substream, struct sn
stream_info->sig_bits);
format_val = snd_hdac_stream_format(runtime->channels, bits, runtime->rate);
+ snd_hdac_ext_stream_decouple(bus, link_stream, true);
snd_hdac_ext_stream_reset(link_stream);
snd_hdac_ext_stream_setup(link_stream, format_val);
@@ -611,6 +612,7 @@ static int avs_dai_fe_prepare(struct snd_pcm_substream *substream, struct snd_so
struct avs_dev *adev = to_avs_dev(dai->dev);
struct hdac_ext_stream *host_stream;
unsigned int format_val;
+ struct hdac_bus *bus;
unsigned int bits;
int ret;
@@ -620,6 +622,8 @@ static int avs_dai_fe_prepare(struct snd_pcm_substream *substream, struct snd_so
if (hdac_stream(host_stream)->prepared)
return 0;
+ bus = hdac_stream(host_stream)->bus;
+ snd_hdac_ext_stream_decouple(bus, data->host_stream, true);
snd_hdac_stream_reset(hdac_stream(host_stream));
stream_info = snd_soc_dai_get_pcm_stream(dai, substream->stream);
--
2.25.1
next prev parent reply other threads:[~2024-04-05 9:08 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-05 9:09 [PATCH 00/13] ASoC: Intel: avs: Fixes and cleanups for 6.10 Cezary Rojewski
2024-04-05 9:09 ` Cezary Rojewski [this message]
2024-04-05 9:09 ` [PATCH 02/13] ASoC: Intel: avs: Fix debug-slot offset calculation Cezary Rojewski
2024-04-05 9:09 ` [PATCH 03/13] ASoC: Intel: avs: Silence false-positive memcpy() warnings Cezary Rojewski
2024-04-05 9:09 ` [PATCH 04/13] ASoC: Intel: avs: Fix config_length for config-less copiers Cezary Rojewski
2024-04-05 9:09 ` [PATCH 05/13] ASoC: Intel: avs: Fix ASRC module initialization Cezary Rojewski
2024-04-05 9:09 ` [PATCH 06/13] ASoC: Intel: avs: Replace risky functions with safer variants Cezary Rojewski
2024-04-05 9:09 ` [PATCH 07/13] ASoC: Intel: avs: Fix potential integer overflow Cezary Rojewski
2024-04-05 9:09 ` [PATCH 08/13] ASoC: Intel: avs: Test result of avs_get_module_entry() Cezary Rojewski
2024-04-05 9:09 ` [PATCH 09/13] ASoC: Intel: avs: Remove dead code Cezary Rojewski
2024-04-05 9:09 ` [PATCH 10/13] ASoC: Intel: avs: Wake from D0ix when starting streaming Cezary Rojewski
2024-04-05 9:09 ` [PATCH 11/13] ASoC: Intel: avs: Init debugfs before booting firmware Cezary Rojewski
2024-04-05 9:09 ` [PATCH 12/13] ASoC: Intel: avs: Add assert_static to guarantee ABI sizes Cezary Rojewski
2024-04-05 9:09 ` [PATCH 13/13] ASoC: Intel: avs: Rule invalid buffer and period sizes out Cezary Rojewski
2024-04-05 23:20 ` [PATCH 00/13] ASoC: Intel: avs: Fixes and cleanups for 6.10 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=20240405090929.1184068-2-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=hdegoede@redhat.com \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.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