| From 722b47c144cd3d892684790c237dd6053da4b4a1 Mon Sep 17 00:00:00 2001 |
| From: Libin Yang <libin.yang@intel.com> |
| Date: Wed, 8 May 2019 10:32:41 +0800 |
| Subject: ASoC: soc-pcm: BE dai needs prepare when pause release after resume |
| |
| [ Upstream commit 5087a8f17df868601cd7568299e91c28086d2b45 ] |
| |
| If playback/capture is paused and system enters S3, after system returns |
| from suspend, BE dai needs to call prepare() callback when playback/capture |
| is released from pause if RESUME_INFO flag is not set. |
| |
| Currently, the dpcm_be_dai_prepare() function will block calling prepare() |
| if the pcm is in SND_SOC_DPCM_STATE_PAUSED state. This will cause the |
| following test case fail if the pcm uses BE: |
| |
| playback -> pause -> S3 suspend -> S3 resume -> pause release |
| |
| The playback may exit abnormally when pause is released because the BE dai |
| prepare() is not called. |
| |
| This patch allows dpcm_be_dai_prepare() to call dai prepare() callback in |
| SND_SOC_DPCM_STATE_PAUSED state. |
| |
| Signed-off-by: Libin Yang <libin.yang@intel.com> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/soc/soc-pcm.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c |
| index 33060af18b5a..6566c8831a96 100644 |
| --- a/sound/soc/soc-pcm.c |
| +++ b/sound/soc/soc-pcm.c |
| @@ -2451,7 +2451,8 @@ int dpcm_be_dai_prepare(struct snd_soc_pcm_runtime *fe, int stream) |
| |
| if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_HW_PARAMS) && |
| (be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP) && |
| - (be->dpcm[stream].state != SND_SOC_DPCM_STATE_SUSPEND)) |
| + (be->dpcm[stream].state != SND_SOC_DPCM_STATE_SUSPEND) && |
| + (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED)) |
| continue; |
| |
| dev_dbg(be->dev, "ASoC: prepare BE %s\n", |
| -- |
| 2.20.1 |
| |
