This makes PulseAudio happier.

Signed-off-by: David Henningsson <david.hennings...@canonical.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.boss...@linux.intel.com>
Signed-off-by: Jerome Anand <jerome.an...@intel.com>
---
 sound/x86/intel_hdmi_audio.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c
index 2dc0881..0802b29 100644
--- a/sound/x86/intel_hdmi_audio.c
+++ b/sound/x86/intel_hdmi_audio.c
@@ -1491,6 +1491,8 @@ static snd_pcm_uframes_t snd_intelhad_pcm_pointer(
 {
        struct snd_intelhad *intelhaddata;
        u32 bytes_rendered = 0;
+       u32 t;
+       int buf_id;
 
        /* pr_debug("snd_intelhad_pcm_pointer called\n"); */
 
@@ -1501,6 +1503,14 @@ static snd_pcm_uframes_t snd_intelhad_pcm_pointer(
                return SNDRV_PCM_POS_XRUN;
        }
 
+       buf_id = intelhaddata->curr_buf % 4;
+       had_read_register(AUD_BUF_A_LENGTH + (buf_id * HAD_REG_WIDTH), &t);
+       if (t == 0) {
+               pr_debug("discovered buffer done for buf %d\n", buf_id);
+               /* had_process_buffer_done(intelhaddata); */
+       }
+       t = intelhaddata->buf_info[buf_id].buf_size - t;
+
        if (intelhaddata->stream_info.buffer_rendered)
                div_u64_rem(intelhaddata->stream_info.buffer_rendered,
                        intelhaddata->stream_info.ring_buf_size,
@@ -1508,7 +1518,7 @@ static snd_pcm_uframes_t snd_intelhad_pcm_pointer(
 
        intelhaddata->stream_info.buffer_ptr = bytes_to_frames(
                                                substream->runtime,
-                                               bytes_rendered);
+                                               bytes_rendered + t);
        return intelhaddata->stream_info.buffer_ptr;
 }
 
-- 
2.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to