Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1093a17 authored by 이경택's avatar 이경택 Committed by Greg Kroah-Hartman
Browse files

ASoC: dpcm: allow start or stop during pause for backend 



commit 21fca8bdbb64df1297e8c65a746c4c9f4a689751 upstream.

soc_compr_trigger_fe() allows start or stop after pause_push.
In dpcm_be_dai_trigger(), however, only pause_release is allowed
command after pause_push.
So, start or stop after pause in compress offload is always
returned as error if the compress offload is used with dpcm.
To fix the problem, SND_SOC_DPCM_STATE_PAUSED should be allowed
for start or stop command.

Signed-off-by: default avatarGyeongtaek Lee <gt82.lee@samsung.com>
Reviewed-by: default avatarVinod Koul <vkoul@kernel.org>
Link: https://lore.kernel.org/r/004d01d607c1$7a3d5250$6eb7f6f0$@samsung.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0185a432

sound/soc/soc-pcm.c

+4 −2
Original line number Diff line number Diff line
@@ -2266,7 +2266,8 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, 
		switch (cmd) {

		case SNDRV_PCM_TRIGGER_START:

			if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_PREPARE) &&

			    (be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP))

			    (be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP) &&

			    (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED))

				continue;



			ret = dpcm_do_trigger(dpcm, be_substream, cmd);
@@ -2296,7 +2297,8 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, 
			be->dpcm[stream].state = SND_SOC_DPCM_STATE_START;

			break;

		case SNDRV_PCM_TRIGGER_STOP:

			if (be->dpcm[stream].state != SND_SOC_DPCM_STATE_START)

			if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_START) &&

			    (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED))

				continue;



			if (!snd_soc_dpcm_can_be_free_stop(fe, be, stream))