mirror of
https://github.com/torvalds/linux
synced 2024-10-19 17:58:44 +00:00
ASoC: SOF: pcm: add .ack callback support
Add the indirections required at the core level for platform-specific operations on ack. Note that on errors in the .ack the ALSA core will restore the previous appl_ptr. Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20211119230852.206310-4-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
b456abe63f
commit
4a39ea3f07
|
@ -487,6 +487,16 @@ snd_sof_pcm_platform_pointer(struct snd_sof_dev *sdev,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* pcm ack */
|
||||||
|
static inline int snd_sof_pcm_platform_ack(struct snd_sof_dev *sdev,
|
||||||
|
struct snd_pcm_substream *substream)
|
||||||
|
{
|
||||||
|
if (sof_ops(sdev) && sof_ops(sdev)->pcm_ack)
|
||||||
|
return sof_ops(sdev)->pcm_ack(sdev, substream);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_PROBES)
|
#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_PROBES)
|
||||||
static inline int
|
static inline int
|
||||||
snd_sof_probe_compr_assign(struct snd_sof_dev *sdev,
|
snd_sof_probe_compr_assign(struct snd_sof_dev *sdev,
|
||||||
|
|
|
@ -917,6 +917,14 @@ static void sof_pcm_remove(struct snd_soc_component *component)
|
||||||
snd_soc_tplg_component_remove(component);
|
snd_soc_tplg_component_remove(component);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int sof_pcm_ack(struct snd_soc_component *component,
|
||||||
|
struct snd_pcm_substream *substream)
|
||||||
|
{
|
||||||
|
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);
|
||||||
|
|
||||||
|
return snd_sof_pcm_platform_ack(sdev, substream);
|
||||||
|
}
|
||||||
|
|
||||||
void snd_sof_new_platform_drv(struct snd_sof_dev *sdev)
|
void snd_sof_new_platform_drv(struct snd_sof_dev *sdev)
|
||||||
{
|
{
|
||||||
struct snd_soc_component_driver *pd = &sdev->plat_drv;
|
struct snd_soc_component_driver *pd = &sdev->plat_drv;
|
||||||
|
@ -935,6 +943,7 @@ void snd_sof_new_platform_drv(struct snd_sof_dev *sdev)
|
||||||
pd->hw_free = sof_pcm_hw_free;
|
pd->hw_free = sof_pcm_hw_free;
|
||||||
pd->trigger = sof_pcm_trigger;
|
pd->trigger = sof_pcm_trigger;
|
||||||
pd->pointer = sof_pcm_pointer;
|
pd->pointer = sof_pcm_pointer;
|
||||||
|
pd->ack = sof_pcm_ack;
|
||||||
|
|
||||||
#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_PROBES)
|
#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_PROBES)
|
||||||
pd->compress_ops = &sof_probe_compressed_ops;
|
pd->compress_ops = &sof_probe_compressed_ops;
|
||||||
|
|
|
@ -207,6 +207,9 @@ struct snd_sof_dsp_ops {
|
||||||
snd_pcm_uframes_t (*pcm_pointer)(struct snd_sof_dev *sdev,
|
snd_pcm_uframes_t (*pcm_pointer)(struct snd_sof_dev *sdev,
|
||||||
struct snd_pcm_substream *substream); /* optional */
|
struct snd_pcm_substream *substream); /* optional */
|
||||||
|
|
||||||
|
/* pcm ack */
|
||||||
|
int (*pcm_ack)(struct snd_sof_dev *sdev, struct snd_pcm_substream *substream); /* optional */
|
||||||
|
|
||||||
#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_PROBES)
|
#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_PROBES)
|
||||||
/* Except for probe_pointer, all probe ops are mandatory */
|
/* Except for probe_pointer, all probe ops are mandatory */
|
||||||
int (*probe_assign)(struct snd_sof_dev *sdev,
|
int (*probe_assign)(struct snd_sof_dev *sdev,
|
||||||
|
|
Loading…
Reference in a new issue