0312-Revert-bcm2835-interpolate-audio-delay.patch 2.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970
  1. From af3ae835c6da0f3383aac9957df02f7160c9d2b4 Mon Sep 17 00:00:00 2001
  2. From: popcornmix <popcornmix@gmail.com>
  3. Date: Fri, 29 Apr 2016 17:27:37 +0100
  4. Subject: [PATCH] Revert "bcm2835: interpolate audio delay"
  5. This reverts commit 83eca613d0eddd2c8299f114b8fe573ccaffdefc.
  6. ---
  7. sound/arm/bcm2835-pcm.c | 12 +-----------
  8. sound/arm/bcm2835.h | 1 -
  9. 2 files changed, 1 insertion(+), 12 deletions(-)
  10. --- a/sound/arm/bcm2835-pcm.c
  11. +++ b/sound/arm/bcm2835-pcm.c
  12. @@ -25,7 +25,7 @@
  13. /* hardware definition */
  14. static struct snd_pcm_hardware snd_bcm2835_playback_hw = {
  15. .info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
  16. - SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_BATCH),
  17. + SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),
  18. .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
  19. .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
  20. .rate_min = 8000,
  21. @@ -99,8 +99,6 @@ static irqreturn_t bcm2835_playback_fifo
  22. alsa_stream->pos %= alsa_stream->buffer_size;
  23. }
  24. - alsa_stream->interpolate_start = ktime_get_ns();
  25. -
  26. if (alsa_stream->substream) {
  27. if (new_period)
  28. snd_pcm_period_elapsed(alsa_stream->substream);
  29. @@ -401,7 +399,6 @@ static int snd_bcm2835_pcm_prepare(struc
  30. alsa_stream->buffer_size = snd_pcm_lib_buffer_bytes(substream);
  31. alsa_stream->period_size = snd_pcm_lib_period_bytes(substream);
  32. alsa_stream->pos = 0;
  33. - alsa_stream->interpolate_start = ktime_get_ns();
  34. audio_debug("buffer_size=%d, period_size=%d pos=%d frame_bits=%d\n",
  35. alsa_stream->buffer_size, alsa_stream->period_size,
  36. @@ -498,7 +495,6 @@ snd_bcm2835_pcm_pointer(struct snd_pcm_s
  37. {
  38. struct snd_pcm_runtime *runtime = substream->runtime;
  39. bcm2835_alsa_stream_t *alsa_stream = runtime->private_data;
  40. - u64 now = ktime_get_ns();
  41. audio_info(" .. IN\n");
  42. @@ -507,12 +503,6 @@ snd_bcm2835_pcm_pointer(struct snd_pcm_s
  43. frames_to_bytes(runtime, runtime->control->appl_ptr),
  44. alsa_stream->pos);
  45. - /* Give userspace better delay reporting by interpolating between GPU
  46. - * notifications, assuming audio speed is close enough to the clock
  47. - * used for ktime */
  48. - if (alsa_stream->interpolate_start && alsa_stream->interpolate_start < now)
  49. - runtime->delay = -(int)div_u64((now - alsa_stream->interpolate_start) * runtime->rate, 1000000000);
  50. -
  51. audio_info(" .. OUT\n");
  52. return snd_pcm_indirect_playback_pointer(substream,
  53. &alsa_stream->pcm_indirect,
  54. --- a/sound/arm/bcm2835.h
  55. +++ b/sound/arm/bcm2835.h
  56. @@ -137,7 +137,6 @@ typedef struct bcm2835_alsa_stream {
  57. unsigned int pos;
  58. unsigned int buffer_size;
  59. unsigned int period_size;
  60. - u64 interpolate_start;
  61. uint32_t enable_fifo_irq;
  62. irq_handler_t fifo_irq_handler;