]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ASoC: SOF: Intel: hda: handle only paused streams in hda_dai_suspend()
authorRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Thu, 7 Nov 2024 13:49:57 +0000 (15:49 +0200)
committerMark Brown <broonie@kernel.org>
Thu, 7 Nov 2024 15:23:28 +0000 (15:23 +0000)
hda_dai_suspend() was added to handle paused stream during system
suspend. But as a side effect, it also ends up cleaning up the DMA
data for those streams that were prepared but not triggered before a
system suspend. Since these streams will not receive the prepare
callback after resuming, we need to preserve the DMA data during suspend.
So, add the check to handle only those streams that are in the paused
state to avoid losing the DMA data for all other streams.

Link: https://github.com/thesofproject/linux/issues/5080
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Fred Oh <fred.oh@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://patch.msgid.link/20241107134957.25160-1-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/intel/hda-dai.c

index 1c823f9eea570082b06827133d7290bb1e8963ab..f1a8491bba9ebf824e951b653125240ad5f95c1f 100644 (file)
@@ -617,6 +617,10 @@ static int hda_dai_suspend(struct hdac_bus *bus)
                        sdai = swidget->private;
                        ops = sdai->platform_private;
 
+                       if (rtd->dpcm[hext_stream->link_substream->stream].state !=
+                           SND_SOC_DPCM_STATE_PAUSED)
+                               continue;
+
                        /* for consistency with TRIGGER_SUSPEND  */
                        if (ops->post_trigger) {
                                ret = ops->post_trigger(sdev, cpu_dai,