]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: b39af5b c117b4a bb29a93 075207d b163be4 e98c89e)
Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/doc', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 13:11:56 +0000 (13:11 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 13:11:56 +0000 (13:11 +0000)
1  2  3  4  5  6 
sound/soc/sh/fsi.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history
sound/soc/soc-pcm.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history

diff --combined sound/soc/sh/fsi.c
index 88e5df474ccf0ed089e23d9fe00f1268189886c9,66fddec9543d0ecc1bb414871d035bc244abc521,66fddec9543d0ecc1bb414871d035bc244abc521,66fddec9543d0ecc1bb414871d035bc244abc521,66fddec9543d0ecc1bb414871d035bc244abc521,eefb16100cd19334c7b79e63d63f074ba5d5d77d..8869971d7884b93e463db07bb304f23c71b3b2c3
--- 1/sound/soc/sh/fsi.c
--- 2/sound/soc/sh/fsi.c
--- 3/sound/soc/sh/fsi.c
--- 4/sound/soc/sh/fsi.c
--- 5/sound/soc/sh/fsi.c
--- 6/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@@@@@@ -842,12 -842,12 -842,12 -842,12 -842,12 -842,9 +842,9 @@@@@@@ static int fsi_clk_disable(struct devic
                return -EINVAL;
      
        if (1 == clock->count--) {
-----           if (clock->xck)
-----                   clk_disable(clock->xck);
-----           if (clock->ick)
-----                   clk_disable(clock->ick);
-----           if (clock->div)
-----                   clk_disable(clock->div);
+++++           clk_disable(clock->xck);
+++++           clk_disable(clock->ick);
+++++           clk_disable(clock->div);
        }
      
        return 0;
@@@@@@@ -1711,7 -1711,8 -1711,8 -1711,8 -1711,8 -1708,8 +1708,7 @@@@@@@ static const struct snd_soc_dai_ops fsi
      static struct snd_pcm_hardware fsi_pcm_hardware = {
        .info =         SNDRV_PCM_INFO_INTERLEAVED      |
                        SNDRV_PCM_INFO_MMAP             |
 -----                  SNDRV_PCM_INFO_MMAP_VALID       |
 -----                  SNDRV_PCM_INFO_PAUSE,
 +++++                  SNDRV_PCM_INFO_MMAP_VALID,
        .buffer_bytes_max       = 64 * 1024,
        .period_bytes_min       = 32,
        .period_bytes_max       = 8192,
diff --combined sound/soc/soc-pcm.c
index 5de2440ff25c759c7735c44e8dc06069ca6bcfc8,002311afdeaa8bd6ceb40d120b0c6afaa13c6119,002311afdeaa8bd6ceb40d120b0c6afaa13c6119,2f4f074d64a4edd081a517900261ba51f0bde213,002311afdeaa8bd6ceb40d120b0c6afaa13c6119,002311afdeaa8bd6ceb40d120b0c6afaa13c6119..eb87d96e2cf0a8807e34a9859918a5c672d17981
--- 1/sound/soc/soc-pcm.c
--- 2/sound/soc/soc-pcm.c
--- 3/sound/soc/soc-pcm.c
--- 4/sound/soc/soc-pcm.c
--- 5/sound/soc/soc-pcm.c
--- 6/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@@@@@@ -654,8 -654,6 -654,6 -654,6 -654,6 -654,6 +654,8 @@@@@@@ static int soc_pcm_close(struct snd_pcm
                        codec_dai->rate = 0;
        }
      
 +++++  snd_soc_dai_digital_mute(cpu_dai, 1, substream->stream);
 +++++
        if (cpu_dai->driver->ops->shutdown)
                cpu_dai->driver->ops->shutdown(substream, cpu_dai);
      
@@@@@@@ -774,7 -772,6 -772,6 -772,6 -772,6 -772,6 +774,7 @@@@@@@ static int soc_pcm_prepare(struct snd_p
        for (i = 0; i < rtd->num_codecs; i++)
                snd_soc_dai_digital_mute(rtd->codec_dais[i], 0,
                                         substream->stream);
 +++++  snd_soc_dai_digital_mute(cpu_dai, 0, substream->stream);
      
      out:
        mutex_unlock(&rtd->pcm_mutex);
@@@@@@@ -1525,36 -1522,13 -1522,13 -1522,13 -1522,13 -1522,13 +1525,36 @@@@@@@ static void dpcm_set_fe_runtime(struct 
                dpcm_init_runtime_hw(runtime, &cpu_dai_drv->capture);
      }
      
 +++++static int dpcm_fe_dai_do_trigger(struct snd_pcm_substream *substream, int cmd);
 +++++
 +++++/* Set FE's runtime_update state; the state is protected via PCM stream lock
 +++++ * for avoiding the race with trigger callback.
 +++++ * If the state is unset and a trigger is pending while the previous operation,
 +++++ * process the pending trigger action here.
 +++++ */
 +++++static void dpcm_set_fe_update_state(struct snd_soc_pcm_runtime *fe,
 +++++                               int stream, enum snd_soc_dpcm_update state)
 +++++{
 +++++  struct snd_pcm_substream *substream =
 +++++          snd_soc_dpcm_get_substream(fe, stream);
 +++++
 +++++  snd_pcm_stream_lock_irq(substream);
 +++++  if (state == SND_SOC_DPCM_UPDATE_NO && fe->dpcm[stream].trigger_pending) {
 +++++          dpcm_fe_dai_do_trigger(substream,
 +++++                                 fe->dpcm[stream].trigger_pending - 1);
 +++++          fe->dpcm[stream].trigger_pending = 0;
 +++++  }
 +++++  fe->dpcm[stream].runtime_update = state;
 +++++  snd_pcm_stream_unlock_irq(substream);
 +++++}
 +++++
      static int dpcm_fe_dai_startup(struct snd_pcm_substream *fe_substream)
      {
        struct snd_soc_pcm_runtime *fe = fe_substream->private_data;
        struct snd_pcm_runtime *runtime = fe_substream->runtime;
        int stream = fe_substream->stream, ret = 0;
      
 -----  fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_FE;
 +++++  dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_FE);
      
        ret = dpcm_be_dai_startup(fe, fe_substream->stream);
        if (ret < 0) {
@@@@@@@ -1576,13 -1550,13 -1550,13 -1550,13 -1550,13 -1550,13 +1576,13 @@@@@@@
        dpcm_set_fe_runtime(fe_substream);
        snd_pcm_limit_hw_rates(runtime);
      
 -----  fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;
 +++++  dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_NO);
        return 0;
      
      unwind:
        dpcm_be_dai_startup_unwind(fe, fe_substream->stream);
      be_err:
 -----  fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;
 +++++  dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_NO);
        return ret;
      }
      
@@@@@@@ -1629,7 -1603,7 -1603,7 -1603,7 -1603,7 -1603,7 +1629,7 @@@@@@@ static int dpcm_fe_dai_shutdown(struct 
        struct snd_soc_pcm_runtime *fe = substream->private_data;
        int stream = substream->stream;
      
 -----  fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_FE;
 +++++  dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_FE);
      
        /* shutdown the BEs */
        dpcm_be_dai_shutdown(fe, substream->stream);
@@@@@@@ -1643,7 -1617,7 -1617,7 -1617,7 -1617,7 -1617,7 +1643,7 @@@@@@@
        dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_STOP);
      
        fe->dpcm[stream].state = SND_SOC_DPCM_STATE_CLOSE;
 -----  fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;
 +++++  dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_NO);
        return 0;
      }
      
@@@@@@@ -1667,10 -1641,6 -1641,6 -1641,6 -1641,6 -1641,6 +1667,10 @@@@@@@ int dpcm_be_dai_hw_free(struct snd_soc_
                if (!snd_soc_dpcm_can_be_free_stop(fe, be, stream))
                                continue;
      
 +++++          /* do not free hw if this BE is used by other FE */
 +++++          if (be->dpcm[stream].users > 1)
 +++++                  continue;
 +++++
                if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_HW_PARAMS) &&
                    (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PREPARE) &&
                    (be->dpcm[stream].state != SND_SOC_DPCM_STATE_HW_FREE) &&
@@@@@@@ -1695,7 -1665,7 -1665,7 -1665,7 -1665,7 -1665,7 +1695,7 @@@@@@@ static int dpcm_fe_dai_hw_free(struct s
        int err, stream = substream->stream;
      
        mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);
 -----  fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_FE;
 +++++  dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_FE);
      
        dev_dbg(fe->dev, "ASoC: hw_free FE %s\n", fe->dai_link->name);
      
@@@@@@@ -1710,7 -1680,7 -1680,7 -1680,7 -1680,7 -1680,7 +1710,7 @@@@@@@
        err = dpcm_be_dai_hw_free(fe, stream);
      
        fe->dpcm[stream].state = SND_SOC_DPCM_STATE_HW_FREE;
 -----  fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;
 +++++  dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_NO);
      
        mutex_unlock(&fe->card->mutex);
        return 0;
@@@@@@@ -1803,7 -1773,7 -1773,7 -1773,7 -1773,7 -1773,7 +1803,7 @@@@@@@ static int dpcm_fe_dai_hw_params(struc
        int ret, stream = substream->stream;
      
        mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);
 -----  fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_FE;
 +++++  dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_FE);
      
        memcpy(&fe->dpcm[substream->stream].hw_params, params,
                        sizeof(struct snd_pcm_hw_params));
@@@@@@@ -1826,7 -1796,7 -1796,7 -1796,7 -1796,7 -1796,7 +1826,7 @@@@@@@
                fe->dpcm[stream].state = SND_SOC_DPCM_STATE_HW_PARAMS;
      
      out:
 -----  fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;
 +++++  dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_NO);
        mutex_unlock(&fe->card->mutex);
        return ret;
      }
@@@@@@@ -1940,7 -1910,7 -1910,7 -1910,7 -1910,7 -1910,7 +1940,7 @@@@@@@ int dpcm_be_dai_trigger(struct snd_soc_
      }
      EXPORT_SYMBOL_GPL(dpcm_be_dai_trigger);
      
 -----static int dpcm_fe_dai_trigger(struct snd_pcm_substream *substream, int cmd)
 +++++static int dpcm_fe_dai_do_trigger(struct snd_pcm_substream *substream, int cmd)
      {
        struct snd_soc_pcm_runtime *fe = substream->private_data;
        int stream = substream->stream, ret;
@@@@@@@ -2014,23 -1984,6 -1984,6 -1984,6 -1984,6 -1984,6 +2014,23 @@@@@@@ out
        return ret;
      }
      
 +++++static int dpcm_fe_dai_trigger(struct snd_pcm_substream *substream, int cmd)
 +++++{
 +++++  struct snd_soc_pcm_runtime *fe = substream->private_data;
 +++++  int stream = substream->stream;
 +++++
 +++++  /* if FE's runtime_update is already set, we're in race;
 +++++   * process this trigger later at exit
 +++++   */
 +++++  if (fe->dpcm[stream].runtime_update != SND_SOC_DPCM_UPDATE_NO) {
 +++++          fe->dpcm[stream].trigger_pending = cmd + 1;
 +++++          return 0; /* delayed, assuming it's successful */
 +++++  }
 +++++
 +++++  /* we're alone, let's trigger */
 +++++  return dpcm_fe_dai_do_trigger(substream, cmd);
 +++++}
 +++++
      int dpcm_be_dai_prepare(struct snd_soc_pcm_runtime *fe, int stream)
      {
        struct snd_soc_dpcm *dpcm;
@@@@@@@ -2074,7 -2027,7 -2027,7 -2027,7 -2027,7 -2027,7 +2074,7 @@@@@@@ static int dpcm_fe_dai_prepare(struct s
      
        dev_dbg(fe->dev, "ASoC: prepare FE %s\n", fe->dai_link->name);
      
 -----  fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_FE;
 +++++  dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_FE);
      
        /* there is no point preparing this FE if there are no BEs */
        if (list_empty(&fe->dpcm[stream].be_clients)) {
@@@@@@@ -2101,7 -2054,7 -2054,7 -2054,7 -2054,7 -2054,7 +2101,7 @@@@@@@
        fe->dpcm[stream].state = SND_SOC_DPCM_STATE_PREPARE;
      
      out:
 -----  fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;
 +++++  dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_NO);
        mutex_unlock(&fe->card->mutex);
      
        return ret;
@@@@@@@ -2248,11 -2201,11 -2201,11 -2201,11 -2201,11 -2201,11 +2248,11 @@@@@@@ static int dpcm_run_new_update(struct s
      {
        int ret;
      
 -----  fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_BE;
 +++++  dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_BE);
        ret = dpcm_run_update_startup(fe, stream);
        if (ret < 0)
                dev_err(fe->dev, "ASoC: failed to startup some BEs\n");
 -----  fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;
 +++++  dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_NO);
      
        return ret;
      }
@@@@@@@ -2261,11 -2214,11 -2214,11 -2214,11 -2214,11 -2214,11 +2261,11 @@@@@@@ static int dpcm_run_old_update(struct s
      {
        int ret;
      
 -----  fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_BE;
 +++++  dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_BE);
        ret = dpcm_run_update_shutdown(fe, stream);
        if (ret < 0)
                dev_err(fe->dev, "ASoC: failed to shutdown some BEs\n");
 -----  fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;
 +++++  dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_NO);
      
        return ret;
      }
@@@@@@@ -2295,7 -2248,7 -2248,7 -2248,13 -2248,7 -2248,7 +2295,13 @@@@@@@ int soc_dpcm_runtime_update(struct snd_
                        fe->dai_link->name);
      
                /* skip if FE doesn't have playback capability */
--- --          if (!fe->cpu_dai->driver->playback.channels_min)
+++ ++          if (!fe->cpu_dai->driver->playback.channels_min
+++ ++              || !fe->codec_dai->driver->playback.channels_min)
+++ ++                  goto capture;
+++ ++
+++ ++          /* skip if FE isn't currently playing */
+++ ++          if (!fe->cpu_dai->playback_active
+++ ++              || !fe->codec_dai->playback_active)
                        goto capture;
      
                paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_PLAYBACK, &list);
@@@@@@@ -2325,7 -2278,7 -2278,7 -2284,13 -2278,7 -2278,7 +2331,13 @@@@@@@
                dpcm_path_put(&list);
      capture:
                /* skip if FE doesn't have capture capability */
--- --          if (!fe->cpu_dai->driver->capture.channels_min)
+++ ++          if (!fe->cpu_dai->driver->capture.channels_min
+++ ++              || !fe->codec_dai->driver->capture.channels_min)
+++ ++                  continue;
+++ ++
+++ ++          /* skip if FE isn't currently capturing */
+++ ++          if (!fe->cpu_dai->capture_active
+++ ++              || !fe->codec_dai->capture_active)
                        continue;
      
                paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_CAPTURE, &list);
local clone of linux.git