Merge "ASoC: msm: q6dspv2: add pause/resume support for audio record" (bcd1e055) · Commits · e / devices / android_kernel_sony_msm8994

sound/soc/msm/qdsp6v2/msm-pcm-q6-v2.c

+51 −38

Original line number	Diff line number	Diff line
		@@ -38,6 +38,12 @@
		#include "msm-pcm-q6-v2.h"
		#include "msm-pcm-routing-v2.h"

		enum stream_state {
		IDLE = 0,
		STOPPED,
		RUNNING,
		};

		static struct audio_locks the_locks;

		#define PCM_MASTER_VOL_MAX_STEPS 0x2000
		@@ -362,6 +368,7 @@ static int msm_pcm_capture_prepare(struct snd_pcm_substream *substream)
		}

		pr_debug("%s\n", __func__);
		if (prtd->enabled == IDLE) {
		params = &soc_prtd->dpcm[substream->stream].hw_params;
		if (params_format(params) == SNDRV_PCM_FORMAT_S24_LE)
		bits_per_sample = 24;
		@@ -394,16 +401,22 @@ static int msm_pcm_capture_prepare(struct snd_pcm_substream *substream)
		pr_err("%s: stream reg failed ret:%d\n", __func__, ret);
		return ret;
		}
		}

		prtd->pcm_size = snd_pcm_lib_buffer_bytes(substream);
		prtd->pcm_count = snd_pcm_lib_period_bytes(substream);
		prtd->pcm_irq_pos = 0;

		/* rate and channels are sent to audio driver */
		prtd->samp_rate = runtime->rate;
		prtd->channel_mode = runtime->channels;

		if (prtd->enabled)
		if (prtd->enabled == IDLE \|\| prtd->enabled == STOPPED) {
		for (i = 0; i < runtime->periods; i++)
		q6asm_read(prtd->audio_client);
		prtd->periods = runtime->periods;
		}

		if (prtd->enabled != IDLE)
		return 0;

		switch (runtime->format) {
		@@ -422,11 +435,7 @@ static int msm_pcm_capture_prepare(struct snd_pcm_substream *substream)
		if (ret < 0)
		pr_debug("%s: cmd cfg pcm was block failed", __func__);

		for (i = 0; i < runtime->periods; i++)
		q6asm_read(prtd->audio_client);
		prtd->periods = runtime->periods;

		prtd->enabled = 1;
		prtd->enabled = RUNNING;

		return ret;
		}
		@@ -447,8 +456,11 @@ static int msm_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
		case SNDRV_PCM_TRIGGER_STOP:
		pr_debug("SNDRV_PCM_TRIGGER_STOP\n");
		atomic_set(&prtd->start, 0);
		if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK)
		if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK) {
		prtd->enabled = STOPPED;
		ret = q6asm_cmd_nowait(prtd->audio_client, CMD_PAUSE);
		break;
		}
		/* pending CMD_EOS isn't expected */
		WARN_ON_ONCE(test_bit(CMD_EOS, &prtd->cmd_pending));
		set_bit(CMD_EOS, &prtd->cmd_pending);
		@@ -549,6 +561,7 @@ static int msm_pcm_open(struct snd_pcm_substream *substream)
		ret);
		}

		prtd->enabled = IDLE;
		prtd->dsp_cnt = 0;
		prtd->set_channel_map = false;
		prtd->reset_event = false;