From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
To: marcht@proton.me, Srinivas Kandagatla <srini@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
Cc: linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: Re: [PATCH v2 2/2] ASoC: qcom: audioreach: only disconnect the route a mixer control owns
Date: Tue, 17 Nov 2026 15:11:44 +0000 [thread overview]
Message-ID: <23d3e257-284f-484e-b7e1-b597208b8fe6@oss.qualcomm.com> (raw)
In-Reply-To: <20261116-q6apm-fixes-v2-2-ea89fb43316a@proton.me>
On 11/16/26 8:16 PM, Marc Herrero via B4 Relay wrote:
> From: Marc Herrero <marcht@proton.me>
>
> Each AudioReach virtual mixer route control ("<BE> Audio Mixer <FE>")
> connects a front-end stream graph to a back-end device graph by storing
> the source module in the device graph's audioreach_graph_info. Writing 0
> to any of these controls clears that link unconditionally, even when the
> device graph is connected to a different front end.
>
> When two front ends can feed the same back end the result therefore
> depends on write order. On QCS6490 (Radxa Dragon Q6A):
>
> - alsactl restore writes 'DISPLAY_PORT_RX_0 Audio Mixer MultiMedia2' = 1
> and then 'DISPLAY_PORT_RX_0 Audio Mixer MultiMedia1' = 0, which leaves
> DisplayPort disconnected although the saved state has it connected;
> - the UCM HDMI enable sequence writes
> 'RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' = 0, which disconnects
> MultiMedia1 from the headphones. A PCM started on MultiMedia1 after
> that never advances (hw_ptr stays at 0).
>
> Make audioreach_connect_sub_graphs() only clear the link when it belongs
> to the control being cleared, using the same test as
> audioreach_is_vmixer_connected() does for get(). The DAPM mixer state is
> still updated for every write, so DAPM keeps tracking each route control
> as before.
>
> Fixes: e4977b91cff8 ("ASoC: qdsp6: audioreach: Simplify handing FE and BE graph connections")
> Cc: stable@vger.kernel.org
> Signed-off-by: Marc Herrero <marcht@proton.me>
> ---
lgtm
Reviewed-by: Srinivas Kandagatla<srinivas.kandagatla@oss.qualcomm.com>
--Srini
> sound/soc/qcom/qdsp6/topology.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/qcom/qdsp6/topology.c b/sound/soc/qcom/qdsp6/topology.c
> index 612d8f03e6e9..aa2ab2b058d0 100644
> --- a/sound/soc/qcom/qdsp6/topology.c
> +++ b/sound/soc/qcom/qdsp6/topology.c
> @@ -1240,7 +1240,9 @@ static void audioreach_connect_sub_graphs(struct q6apm *apm,
> info->dst_mod_inst_id = m2->module_instance_id;
> info->dst_mod_ip_port_id = 2;
>
> - } else {
> + } else if (info->src_mod_inst_id == m1->module_instance_id &&
> + info->dst_mod_inst_id == m2->module_instance_id) {
> + /* only drop the link this control made, not another FE's */
> info->src_mod_inst_id = 0;
> info->src_mod_op_port_id = 0;
> info->dst_mod_inst_id = 0;
>
prev parent reply other threads:[~2026-11-17 15:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 20:16 [PATCH v2 0/2] ASoC: qcom: audioreach: fix S24_LE playback and route mixer disconnects Marc Herrero via B4 Relay
2026-11-16 20:16 ` [PATCH v2 1/2] ASoC: qcom: audioreach: use a 32-bit container for S24_LE PCM Marc Herrero via B4 Relay
2026-11-16 20:16 ` [PATCH v2 2/2] ASoC: qcom: audioreach: only disconnect the route a mixer control owns Marc Herrero via B4 Relay
2026-11-17 15:11 ` Srinivas Kandagatla [this message]
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=23d3e257-284f-484e-b7e1-b597208b8fe6@oss.qualcomm.com \
--to=srinivas.kandagatla@oss.qualcomm.com \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=marcht@proton.me \
--cc=perex@perex.cz \
--cc=pierre-louis.bossart@linux.dev \
--cc=srini@kernel.org \
--cc=stable@vger.kernel.org \
--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
all inboxes | Powered by JetHome®