summaryrefslogtreecommitdiff
path: root/sound/soc/soc-pcm.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/soc-pcm.c')
-rw-r--r--sound/soc/soc-pcm.c38
1 files changed, 35 insertions, 3 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 11c9853e9e80..6f43db35a5c8 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2090,6 +2090,7 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream,
int cmd)
{
struct snd_soc_pcm_runtime *be;
+ bool pause_stop_transition;
struct snd_soc_dpcm *dpcm;
unsigned long flags;
int ret = 0;
@@ -2121,6 +2122,13 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream,
if (be->dpcm[stream].be_start != 1)
goto next;
+ if (be->dpcm[stream].state == SND_SOC_DPCM_STATE_PAUSED)
+ ret = soc_pcm_trigger(be_substream,
+ SNDRV_PCM_TRIGGER_PAUSE_RELEASE);
+ else
+ ret = soc_pcm_trigger(be_substream,
+ SNDRV_PCM_TRIGGER_START);
+
ret = soc_pcm_trigger(be_substream, cmd);
if (ret) {
be->dpcm[stream].be_start--;
@@ -2148,10 +2156,12 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream,
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
if (!be->dpcm[stream].be_start &&
(be->dpcm[stream].state != SND_SOC_DPCM_STATE_START) &&
- (be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP) &&
(be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED))
goto next;
+ fe->dpcm[stream].fe_pause = false;
+ be->dpcm[stream].be_pause--;
+
be->dpcm[stream].be_start++;
if (be->dpcm[stream].be_start != 1)
goto next;
@@ -2175,14 +2185,33 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream,
if (be->dpcm[stream].be_start != 0)
goto next;
- ret = soc_pcm_trigger(be_substream, cmd);
+ pause_stop_transition = false;
+ if (fe->dpcm[stream].fe_pause) {
+ pause_stop_transition = true;
+ fe->dpcm[stream].fe_pause = false;
+ be->dpcm[stream].be_pause--;
+ }
+
+ if (be->dpcm[stream].be_pause != 0)
+ ret = soc_pcm_trigger(be_substream, SNDRV_PCM_TRIGGER_PAUSE_PUSH);
+ else
+ ret = soc_pcm_trigger(be_substream, SNDRV_PCM_TRIGGER_STOP);
+
if (ret) {
if (be->dpcm[stream].state == SND_SOC_DPCM_STATE_START)
be->dpcm[stream].be_start++;
+ if (pause_stop_transition) {
+ fe->dpcm[stream].fe_pause = true;
+ be->dpcm[stream].be_pause++;
+ }
goto next;
}
- be->dpcm[stream].state = SND_SOC_DPCM_STATE_STOP;
+ if (be->dpcm[stream].be_pause != 0)
+ be->dpcm[stream].state = SND_SOC_DPCM_STATE_PAUSED;
+ else
+ be->dpcm[stream].state = SND_SOC_DPCM_STATE_STOP;
+
break;
case SNDRV_PCM_TRIGGER_SUSPEND:
if (be->dpcm[stream].state != SND_SOC_DPCM_STATE_START)
@@ -2204,6 +2233,9 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream,
if (be->dpcm[stream].state != SND_SOC_DPCM_STATE_START)
goto next;
+ fe->dpcm[stream].fe_pause = true;
+ be->dpcm[stream].be_pause++;
+
be->dpcm[stream].be_start--;
if (be->dpcm[stream].be_start != 0)
goto next;