ASoC: fsl_ssi: Add suspend/resume support
diff mbox

Message ID 1400823536-31708-1-git-send-email-festevam@gmail.com
State Accepted
Commit b20e53a826a7adc3bfd2772bd49a83b6f21b4cce
Headers show

Commit Message

Fabio Estevam May 23, 2014, 5:38 a.m. UTC
From: Fabio Estevam <fabio.estevam@freescale.com>

Doing a suspend/resume sequence while playing an audio track in the backgroung
causes broken audio right after resume:

root@freescale /$ aplay clarinet.wav &

root@freescale /home$ Playing WAVE 'clarinet.wav' : Signed 16 bit Little Endian,
 Rate 44100 Hz, Mono

root@freescale /home$ echo mem > /sys/power/state 
PM: Syncing filesystems ... done.
Freezing user space processes ... (elapsed 0.002 seconds) done.
Freezing remaining freezable tasks ... (elapsed 0.002 seconds) done.
Suspending console(s) (use no_console_suspend to debug)
PM: suspend of devices complete after 37.082 msecs
PM: suspend devices took 0.040 seconds
PM: late suspend of devices complete after 4.234 msecs
PM: noirq suspend of devices complete after 4.618 msecs
Disabling non-boot CPUs ...
PM: noirq resume of devices complete after 4.013 msecs
PM: early resume of devices complete after 4.000 msecs
PM: resume of devices complete after 68.907 msecs
PM: resume devices took 0.070 seconds
Restarting tasks ... Suspended. Trying resume. Failed. Restarting stream. Done.
Suspended. Trying resume. Failed. Restarting stream. Done.
Suspended. Trying resume. Failed. Restarting stream. Done.
Suspended. Trying resume. Failed. Restarting stream. Done.
Suspended. Trying resume. Failed. Restarting stream. Done.
Suspended. Trying resume. Failed. Restarting stream. Done.
Suspended. Trying resume. Failed. Restarting stream. Done.
....

Add SNDRV_PCM_TRIGGER_RESUME/SUSPEND cases so that we can gracefully handle
system suspend/resume.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 sound/soc/fsl/fsl_ssi.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Shawn Guo May 23, 2014, 9:18 a.m. UTC | #1
On Fri, May 23, 2014 at 02:38:56AM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Doing a suspend/resume sequence while playing an audio track in the backgroung
> causes broken audio right after resume:
> 
> root@freescale /$ aplay clarinet.wav &
> 
> root@freescale /home$ Playing WAVE 'clarinet.wav' : Signed 16 bit Little Endian,
>  Rate 44100 Hz, Mono
> 
> root@freescale /home$ echo mem > /sys/power/state 
> PM: Syncing filesystems ... done.
> Freezing user space processes ... (elapsed 0.002 seconds) done.
> Freezing remaining freezable tasks ... (elapsed 0.002 seconds) done.
> Suspending console(s) (use no_console_suspend to debug)
> PM: suspend of devices complete after 37.082 msecs
> PM: suspend devices took 0.040 seconds
> PM: late suspend of devices complete after 4.234 msecs
> PM: noirq suspend of devices complete after 4.618 msecs
> Disabling non-boot CPUs ...
> PM: noirq resume of devices complete after 4.013 msecs
> PM: early resume of devices complete after 4.000 msecs
> PM: resume of devices complete after 68.907 msecs
> PM: resume devices took 0.070 seconds
> Restarting tasks ... Suspended. Trying resume. Failed. Restarting stream. Done.
> Suspended. Trying resume. Failed. Restarting stream. Done.
> Suspended. Trying resume. Failed. Restarting stream. Done.
> Suspended. Trying resume. Failed. Restarting stream. Done.
> Suspended. Trying resume. Failed. Restarting stream. Done.
> Suspended. Trying resume. Failed. Restarting stream. Done.
> Suspended. Trying resume. Failed. Restarting stream. Done.
> ....
> 
> Add SNDRV_PCM_TRIGGER_RESUME/SUSPEND cases so that we can gracefully handle
> system suspend/resume.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Acked-by: Shawn Guo <shawn.guo@freescale.com>
Mark Brown May 26, 2014, 1:24 p.m. UTC | #2
On Fri, May 23, 2014 at 02:38:56AM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Doing a suspend/resume sequence while playing an audio track in the backgroung
> causes broken audio right after resume:

Applied, thanks.

Patch
diff mbox

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index f233d91..090f449 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -874,6 +874,7 @@  static int fsl_ssi_trigger(struct snd_pcm_substream *substream, int cmd,
 
 	switch (cmd) {
 	case SNDRV_PCM_TRIGGER_START:
+	case SNDRV_PCM_TRIGGER_RESUME:
 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
 		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
 			fsl_ssi_tx_config(ssi_private, true);
@@ -882,6 +883,7 @@  static int fsl_ssi_trigger(struct snd_pcm_substream *substream, int cmd,
 		break;
 
 	case SNDRV_PCM_TRIGGER_STOP:
+	case SNDRV_PCM_TRIGGER_SUSPEND:
 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
 		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
 			fsl_ssi_tx_config(ssi_private, false);