Merge tag 'v4.0-rc2' into x86/asm, to refresh the tree

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 19 insertions, 4 deletions

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 095d9572ad2b..279e24f61305 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -26,6 +26,7 @@
 #include <linux/time.h>
 #include <linux/pm_qos.h>
 #include <linux/aio.h>
+#include <linux/io.h>
 #include <linux/dma-mapping.h>
 #include <sound/core.h>
 #include <sound/control.h>
@@ -34,7 +35,6 @@
 #include <sound/pcm_params.h>
 #include <sound/timer.h>
 #include <sound/minors.h>
-#include <asm/io.h>
 
 /*
  *  Compatibility
@@ -420,7 +420,8 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream,
 
         hw = &substream->runtime->hw;
         if (!params->info) {
-                params->info = hw->info & ~SNDRV_PCM_INFO_FIFO_IN_FRAMES;
+                params->info = hw->info & ~(SNDRV_PCM_INFO_FIFO_IN_FRAMES |
+                                            SNDRV_PCM_INFO_DRAIN_TRIGGER);
                 if (!hw_support_mmap(substream))
                         params->info &= ~(SNDRV_PCM_INFO_MMAP |
                                           SNDRV_PCM_INFO_MMAP_VALID);
@@ -719,8 +720,11 @@ int snd_pcm_status(struct snd_pcm_substream *substream,
                                 runtime->status->audio_tstamp;
                         goto _tstamp_end;
                 }
+        } else {
+                /* get tstamp only in fallback mode and only if enabled */
+                if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE)
+                        snd_pcm_gettime(runtime, &status->tstamp);
         }
-        snd_pcm_gettime(runtime, &status->tstamp);
  _tstamp_end:
         status->appl_ptr = runtime->control->appl_ptr;
         status->hw_ptr = runtime->status->hw_ptr;
@@ -806,7 +810,8 @@ static void snd_pcm_trigger_tstamp(struct snd_pcm_substream *substream)
         if (runtime->trigger_master == NULL)
                 return;
         if (runtime->trigger_master == substream) {
-                snd_pcm_gettime(runtime, &runtime->trigger_tstamp);
+                if (!runtime->trigger_tstamp_latched)
+                        snd_pcm_gettime(runtime, &runtime->trigger_tstamp);
         } else {
                 snd_pcm_trigger_tstamp(runtime->trigger_master);
                 runtime->trigger_tstamp = runtime->trigger_master->runtime->trigger_tstamp;
@@ -975,6 +980,7 @@ static int snd_pcm_pre_start(struct snd_pcm_substream *substream, int state)
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
             !snd_pcm_playback_data(substream))
                 return -EPIPE;
+        runtime->trigger_tstamp_latched = false;
         runtime->trigger_master = substream;
         return 0;
 }
@@ -1546,6 +1552,8 @@ static int snd_pcm_do_drain_init(struct snd_pcm_substream *substream, int state)
                         if (! snd_pcm_playback_empty(substream)) {
                                 snd_pcm_do_start(substream, SNDRV_PCM_STATE_DRAINING);
                                 snd_pcm_post_start(substream, SNDRV_PCM_STATE_DRAINING);
+                        } else {
+                                runtime->status->state = SNDRV_PCM_STATE_SETUP;
                         }
                         break;
                 case SNDRV_PCM_STATE_RUNNING:
@@ -1566,6 +1574,13 @@ static int snd_pcm_do_drain_init(struct snd_pcm_substream *substream, int state)
                         snd_pcm_post_stop(substream, new_state);
                 }
         }
+
+        if (runtime->status->state == SNDRV_PCM_STATE_DRAINING &&
+            runtime->trigger_master == substream &&
+            (runtime->hw.info & SNDRV_PCM_INFO_DRAIN_TRIGGER))
+                return substream->ops->trigger(substream,
+                                               SNDRV_PCM_TRIGGER_DRAIN);
+
         return 0;
 }