* FAILED: patch "[PATCH] ASoC: SOF: keep prepare/unprepare widgets in sink path" failed to apply to 6.1-stable tree
@ 2023-02-07 7:52 gregkh
2023-02-07 8:03 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: gregkh @ 2023-02-07 7:52 UTC (permalink / raw)
To: yung-chuan.liao, broonie, peter.ujfalusi, pierre-louis.bossart,
rander.wang, ranjani.sridharan, stable
Cc: stable
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
Possible dependencies:
cc755b4377b0 ("ASoC: SOF: keep prepare/unprepare widgets in sink path")
0ad84b11f2f8 ("ASoC: SOF: sof-audio: skip prepare/unprepare if swidget is NULL")
7d2a67e02549 ("ASoC: SOF: sof-audio: unprepare when swidget->use_count > 0")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From cc755b4377b0520d594ae573497cf0824baea648 Mon Sep 17 00:00:00 2001
From: Bard Liao <yung-chuan.liao@linux.intel.com>
Date: Wed, 18 Jan 2023 12:12:55 +0200
Subject: [PATCH] ASoC: SOF: keep prepare/unprepare widgets in sink path
The existing code return when a widget doesn't need to
prepare/unprepare. This will prevent widgets in the sink path from being
prepared/unprepared.
Cc: <stable@vger.kernel.org> # 6.1
Link: https://github.com/thesofproject/linux/issues/4021
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230118101255.29139-4-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c
index 8c114e6a23c6..ff716bfbcb67 100644
--- a/sound/soc/sof/sof-audio.c
+++ b/sound/soc/sof/sof-audio.c
@@ -271,9 +271,9 @@ sof_unprepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widg
struct snd_sof_widget *swidget = widget->dobj.private;
struct snd_soc_dapm_path *p;
- /* return if the widget is in use or if it is already unprepared */
+ /* skip if the widget is in use or if it is already unprepared */
if (!swidget || !swidget->prepared || swidget->use_count > 0)
- return;
+ goto sink_unprepare;
if (widget_ops[widget->id].ipc_unprepare)
/* unprepare the source widget */
@@ -281,6 +281,7 @@ sof_unprepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widg
swidget->prepared = false;
+sink_unprepare:
/* unprepare all widgets in the sink paths */
snd_soc_dapm_widget_for_each_sink_path(widget, p) {
if (!p->walking && p->sink->dobj.private) {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: FAILED: patch "[PATCH] ASoC: SOF: keep prepare/unprepare widgets in sink path" failed to apply to 6.1-stable tree
2023-02-07 7:52 FAILED: patch "[PATCH] ASoC: SOF: keep prepare/unprepare widgets in sink path" failed to apply to 6.1-stable tree gregkh
@ 2023-02-07 8:03 ` Greg KH
2023-02-07 10:02 ` Péter Ujfalusi
0 siblings, 1 reply; 4+ messages in thread
From: Greg KH @ 2023-02-07 8:03 UTC (permalink / raw)
To: yung-chuan.liao, broonie, peter.ujfalusi, pierre-louis.bossart,
rander.wang, ranjani.sridharan, stable
On Tue, Feb 07, 2023 at 08:52:14AM +0100, gregkh@linuxfoundation.org wrote:
>
> The patch below does not apply to the 6.1-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@vger.kernel.org>.
>
> Possible dependencies:
>
> cc755b4377b0 ("ASoC: SOF: keep prepare/unprepare widgets in sink path")
> 0ad84b11f2f8 ("ASoC: SOF: sof-audio: skip prepare/unprepare if swidget is NULL")
> 7d2a67e02549 ("ASoC: SOF: sof-audio: unprepare when swidget->use_count > 0")
Oops, nevermind, I got this to work, sorry for the noise.
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: FAILED: patch "[PATCH] ASoC: SOF: keep prepare/unprepare widgets in sink path" failed to apply to 6.1-stable tree
2023-02-07 8:03 ` Greg KH
@ 2023-02-07 10:02 ` Péter Ujfalusi
2023-02-07 10:23 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Péter Ujfalusi @ 2023-02-07 10:02 UTC (permalink / raw)
To: Greg KH, yung-chuan.liao, broonie, pierre-louis.bossart,
rander.wang, ranjani.sridharan, stable
Hi Greg,
On 07/02/2023 10:03, Greg KH wrote:
> On Tue, Feb 07, 2023 at 08:52:14AM +0100, gregkh@linuxfoundation.org wrote:
>>
>> The patch below does not apply to the 6.1-stable tree.
>> If someone wants it applied there, or to any other stable or longterm
>> tree, then please email the backport, including the original git commit
>> id to <stable@vger.kernel.org>.
>>
>> Possible dependencies:
>>
>> cc755b4377b0 ("ASoC: SOF: keep prepare/unprepare widgets in sink path")
>> 0ad84b11f2f8 ("ASoC: SOF: sof-audio: skip prepare/unprepare if swidget is NULL")
>> 7d2a67e02549 ("ASoC: SOF: sof-audio: unprepare when swidget->use_count > 0")
>
> Oops, nevermind, I got this to work, sorry for the noise.
I was about to take a look at this to assist you.
Sorry for being late, I guess all is good now?
--
Péter
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: FAILED: patch "[PATCH] ASoC: SOF: keep prepare/unprepare widgets in sink path" failed to apply to 6.1-stable tree
2023-02-07 10:02 ` Péter Ujfalusi
@ 2023-02-07 10:23 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2023-02-07 10:23 UTC (permalink / raw)
To: Péter Ujfalusi
Cc: yung-chuan.liao, broonie, pierre-louis.bossart, rander.wang,
ranjani.sridharan, stable
On Tue, Feb 07, 2023 at 12:02:26PM +0200, Péter Ujfalusi wrote:
> Hi Greg,
>
> On 07/02/2023 10:03, Greg KH wrote:
> > On Tue, Feb 07, 2023 at 08:52:14AM +0100, gregkh@linuxfoundation.org wrote:
> >>
> >> The patch below does not apply to the 6.1-stable tree.
> >> If someone wants it applied there, or to any other stable or longterm
> >> tree, then please email the backport, including the original git commit
> >> id to <stable@vger.kernel.org>.
> >>
> >> Possible dependencies:
> >>
> >> cc755b4377b0 ("ASoC: SOF: keep prepare/unprepare widgets in sink path")
> >> 0ad84b11f2f8 ("ASoC: SOF: sof-audio: skip prepare/unprepare if swidget is NULL")
> >> 7d2a67e02549 ("ASoC: SOF: sof-audio: unprepare when swidget->use_count > 0")
> >
> > Oops, nevermind, I got this to work, sorry for the noise.
>
> I was about to take a look at this to assist you.
> Sorry for being late, I guess all is good now?
All should be good, see the other emails saying this was applied to
verify it please.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-02-07 10:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-07 7:52 FAILED: patch "[PATCH] ASoC: SOF: keep prepare/unprepare widgets in sink path" failed to apply to 6.1-stable tree gregkh
2023-02-07 8:03 ` Greg KH
2023-02-07 10:02 ` Péter Ujfalusi
2023-02-07 10:23 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.