Skip to contentSkip to conversation

ASoC: pcm: allow backend hardware to be freed in pause state

PATCH In review Patrick Lai 2 participants 2 messages Dec 12, 2012 – Dec 15, 2012

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: pcm: allow backend hardware to be freed in pause state

When front-end PCM session is in paused state, back-end PCM session will be put in paused state as well if given front-end PCM session is the only client of given back-end. Then, application closes front-end PCM session, DPCM framework will not allow back-end enters HW_FREE state so back-end will never get shutdown completely.

---
 sound/soc/soc-pcm.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
sound/soc/soc-pcm.c +1 -1
index ef22d0b..d340644 100644
@@ -1240,7 +1240,7 @@ static int dpcm_be_dai_hw_free(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_PREPARE) &&
 		    (be->dpcm[stream].state != SND_SOC_DPCM_STATE_HW_FREE) &&
+		    (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED) &&
 		    (be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP))
 			continue;
 
-- 

The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
1.7.8.3

#1 lore raw
Quoted 6 lines · Patrick Lai

When front-end PCM session is in paused state, back-end PCM session will be put in paused state as well if given front-end PCM session is the only client of given back-end. Then, application closes front-end PCM session, DPCM framework will not allow back-end enters HW_FREE state so back-end will never get shutdown completely.

This still doesn't apply against mainline, applying to v3.7 gives:

$ git am -3 --signoff /tmp/fnord
Applying: ASoC: pcm: allow backend hardware to be freed in pause state
Using index info to reconstruct a base tree...
error: patch failed: sound/soc/soc-pcm.c:1240
error: sound/soc/soc-pcm.c: patch does not apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.
Patch failed at 0001 ASoC: pcm: allow backend hardware to be freed in pause state

I can't see what's wrong but that's making me worry about applying it by hand as it seems likely that there's some aspect of it thatd' be missed; the plain patch program also has similar issues.