forked from Minki/linux
6374f493d9
soc_pcm_trigger() calls DAI/Component/Link trigger,
but some of them might be failed.
static int soc_pcm_trigger(...)
{
...
switch (cmd) {
case SNDRV_PCM_TRIGGER_START:
case SNDRV_PCM_TRIGGER_RESUME:
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
ret = snd_soc_link_trigger(substream, cmd);
if (ret < 0)
break;
(*) ret = snd_soc_pcm_component_trigger(substream, cmd);
if (ret < 0)
break;
ret = snd_soc_pcm_dai_trigger(substream, cmd);
break;
case SNDRV_PCM_TRIGGER_STOP:
case SNDRV_PCM_TRIGGER_SUSPEND:
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
ret = snd_soc_pcm_dai_trigger(substream, cmd);
if (ret < 0)
break;
ret = snd_soc_pcm_component_trigger(substream, cmd);
if (ret < 0)
break;
ret = snd_soc_link_trigger(substream, cmd);
break;
}
...
}
For example, if soc_pcm_trigger() failed at (*) point,
we need to rollback previous succeeded trigger.
This patch adds trigger mark for DAI/Component/Link,
and do STOP if START/RESUME/PAUSE_RELEASE were failed.
Because it need to use new rollback parameter,
we need to modify DAI/Component/Link trigger functions in the same time.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87a6uycssd.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
33 lines
1.1 KiB
C
33 lines
1.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0
|
|
*
|
|
* soc-link.h
|
|
*
|
|
* Copyright (C) 2019 Renesas Electronics Corp.
|
|
* Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
|
|
*/
|
|
#ifndef __SOC_LINK_H
|
|
#define __SOC_LINK_H
|
|
|
|
int snd_soc_link_init(struct snd_soc_pcm_runtime *rtd);
|
|
void snd_soc_link_exit(struct snd_soc_pcm_runtime *rtd);
|
|
int snd_soc_link_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
|
|
struct snd_pcm_hw_params *params);
|
|
|
|
int snd_soc_link_startup(struct snd_pcm_substream *substream);
|
|
void snd_soc_link_shutdown(struct snd_pcm_substream *substream,
|
|
int rollback);
|
|
int snd_soc_link_prepare(struct snd_pcm_substream *substream);
|
|
int snd_soc_link_hw_params(struct snd_pcm_substream *substream,
|
|
struct snd_pcm_hw_params *params);
|
|
void snd_soc_link_hw_free(struct snd_pcm_substream *substream,
|
|
int rollback);
|
|
|
|
int snd_soc_link_trigger(struct snd_pcm_substream *substream, int cmd,
|
|
int rollback);
|
|
int snd_soc_link_compr_startup(struct snd_compr_stream *cstream);
|
|
void snd_soc_link_compr_shutdown(struct snd_compr_stream *cstream,
|
|
int rollback);
|
|
int snd_soc_link_compr_set_params(struct snd_compr_stream *cstream);
|
|
|
|
#endif /* __SOC_LINK_H */
|