[PATCH] ASoc: fix ASoC driver to support ops to register get_time_info
From: Chien-Yu Lin <hidden>
Date: 2021-08-20 13:03:10
Also in:
linux-mediatek, lkml
Subsystem:
sound, sound - soc layer / dynamic audio power management (asoc), the rest · Maintainers:
Jaroslav Kysela, Takashi Iwai, Liam Girdwood, Mark Brown, Linus Torvalds
From: "chien-yu.lin" <redacted> Because ASoC soc_new_pcm() function didn't register .get_time_info() ops and cause snd_pcm_update_hw_ptr0() can not find substream->ops->get_time_info, it will not be called due to ASoC driver which register in HW device driver. Add .get_time_info() ops in ASoC soc_new_pcm() and register by snd_pcm_set_ops() function. If HW device driver want to implment timestamp by itself, ASoC should register .get_time_info function. Signed-off-by: chien-yu.lin <redacted> --- include/sound/soc-component.h | 4 ++++ sound/soc/soc-component.c | 21 +++++++++++++++++++++ sound/soc/soc-pcm.c | 2 ++ 3 files changed, 27 insertions(+)
diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index 8c4d6830597f..52b5228b7a8d 100644
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h@@ -484,6 +484,10 @@ int snd_soc_pcm_component_sync_stop(struct snd_pcm_substream *substream); int snd_soc_pcm_component_copy_user(struct snd_pcm_substream *substream, int channel, unsigned long pos, void __user *buf, unsigned long bytes); +int snd_soc_pcm_component_get_time_info(struct snd_pcm_substream *substream, + struct timespec64 *system_ts, struct timespec64 *audio_ts, + struct snd_pcm_audio_tstamp_config *audio_tstamp_config, + struct snd_pcm_audio_tstamp_report *audio_tstamp_report); struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream, unsigned long offset); int snd_soc_pcm_component_mmap(struct snd_pcm_substream *substream,
diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index 3a5e84e16a87..56caec7ec00b 100644
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c@@ -1000,6 +1000,27 @@ int snd_soc_pcm_component_copy_user(struct snd_pcm_substream *substream, return -EINVAL; } +int snd_soc_pcm_component_get_time_info(struct snd_pcm_substream *substream, + struct timespec64 *system_ts, struct timespec64 *audio_ts, + struct snd_pcm_audio_tstamp_config *audio_tstamp_config, + struct snd_pcm_audio_tstamp_report *audio_tstamp_report) +{ + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_component *component; + int i; + + /* FIXME. it returns 1st get_time_info now */ + for_each_rtd_components(rtd, i, component) { + if (component->driver->get_time_info) + return soc_component_ret(component, + component->driver->get_time_info(component, + substream, system_ts, audio_ts, + audio_tstamp_config, audio_tstamp_report)); + } + + return -EINVAL; +} + struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream, unsigned long offset) {
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index d1c570ca21ea..cff7025027a6 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c@@ -2786,6 +2786,8 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) rtd->ops.mmap = snd_soc_pcm_component_mmap; if (drv->ack) rtd->ops.ack = snd_soc_pcm_component_ack; + if (drv->get_time_info) + rtd->ops.get_time_info = snd_soc_pcm_component_get_time_info; } if (playback)
--
2.18.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel