diff options
| author | Liam Girdwood <liam.r.girdwood@linux.intel.com> | 2014-05-02 17:56:33 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-02 18:54:05 +0200 |
| commit | 51b4e24f383c84ed927fef348072b6dc65b9816d (patch) | |
| tree | d0818cfe74582d6152c4b094d915bd53c8f36333 /sound/soc/intel/sst-haswell-ipc.c | |
| parent | ASoC: Intel: Fix allow hw_params to be called more than once. (diff) | |
| download | linux-51b4e24f383c84ed927fef348072b6dc65b9816d.tar.xz linux-51b4e24f383c84ed927fef348072b6dc65b9816d.zip | |
ASoC: Intel: Fix stream position pointer.
Read the stream offset and presentation position from DSP memory rather
than using the old estimated position. This fixes timing issues with
pulseaudio.
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/intel/sst-haswell-ipc.c')
| -rw-r--r-- | sound/soc/intel/sst-haswell-ipc.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/sound/soc/intel/sst-haswell-ipc.c b/sound/soc/intel/sst-haswell-ipc.c index 5bcf5963a0ba..e7996b39a484 100644 --- a/sound/soc/intel/sst-haswell-ipc.c +++ b/sound/soc/intel/sst-haswell-ipc.c @@ -1547,10 +1547,28 @@ int sst_hsw_stream_reset(struct sst_hsw *hsw, struct sst_hsw_stream *stream) } /* Stream pointer positions */ -int sst_hsw_get_dsp_position(struct sst_hsw *hsw, +u32 sst_hsw_get_dsp_position(struct sst_hsw *hsw, struct sst_hsw_stream *stream) { - return stream->rpos.position; + u32 rpos; + + sst_dsp_read(hsw->dsp, &rpos, + stream->reply.read_position_register_address, sizeof(rpos)); + + return rpos; +} + +/* Stream presentation (monotonic) positions */ +u64 sst_hsw_get_dsp_presentation_position(struct sst_hsw *hsw, + struct sst_hsw_stream *stream) +{ + u64 ppos; + + sst_dsp_read(hsw->dsp, &ppos, + stream->reply.presentation_position_register_address, + sizeof(ppos)); + + return ppos; } int sst_hsw_stream_set_write_position(struct sst_hsw *hsw, |