| Message ID | 1424147303-92196-1-git-send-email-libin.yang@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9fd37810daa56b8c0a8d51565216c95220889e62 |
| Headers | show |
Hi Takashi & Mark, This patch is for Takashi's tree. Regards, Libin > -----Original Message----- > From: Yang, Libin > Sent: Tuesday, February 17, 2015 12:28 PM > To: alsa-devel@alsa-project.org; tiwai@suse.de; > broonie@sirena.org.uk > Cc: Girdwood, Liam R; Yang, Libin; Jie, Yang > Subject: [PATCH] ASoC: Intel: add > SNDRV_PCM_INFO_DRAIN_TRIGGER flag > > From: Libin Yang <libin.yang@intel.com> > > Add SNDRV_PCM_INFO_DRAIN_TRIGGER in snd_pcm_hardware.info > to > call sst_hsw_stream_set_silence_start() when PCM draining. > > Signed-off-by: Libin Yang <libin.yang@intel.com> > --- > sound/soc/intel/sst-haswell-pcm.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/intel/sst-haswell-pcm.c b/sound/soc/intel/sst- > haswell-pcm.c > index d6fa9d5..7e21e8f 100644 > --- a/sound/soc/intel/sst-haswell-pcm.c > +++ b/sound/soc/intel/sst-haswell-pcm.c > @@ -91,7 +91,8 @@ static const struct snd_pcm_hardware > hsw_pcm_hardware = { > SNDRV_PCM_INFO_INTERLEAVED | > SNDRV_PCM_INFO_PAUSE | > SNDRV_PCM_INFO_RESUME | > - > SNDRV_PCM_INFO_NO_PERIOD_WAKEUP, > + > SNDRV_PCM_INFO_NO_PERIOD_WAKEUP | > + SNDRV_PCM_INFO_DRAIN_TRIGGER, > .formats = SNDRV_PCM_FMTBIT_S16_LE | > SNDRV_PCM_FMTBIT_S24_LE | > SNDRV_PCM_FMTBIT_S32_LE, > .period_bytes_min = PAGE_SIZE, > -- > 1.9.1
At Tue, 17 Feb 2015 04:53:45 +0000, Yang, Libin wrote: > > Hi Takashi & Mark, > > This patch is for Takashi's tree. OK, I took it to for-linus (or for-next, equivalently) branch now. thanks, Takashi > > Regards, > Libin > > > > -----Original Message----- > > From: Yang, Libin > > Sent: Tuesday, February 17, 2015 12:28 PM > > To: alsa-devel@alsa-project.org; tiwai@suse.de; > > broonie@sirena.org.uk > > Cc: Girdwood, Liam R; Yang, Libin; Jie, Yang > > Subject: [PATCH] ASoC: Intel: add > > SNDRV_PCM_INFO_DRAIN_TRIGGER flag > > > > From: Libin Yang <libin.yang@intel.com> > > > > Add SNDRV_PCM_INFO_DRAIN_TRIGGER in snd_pcm_hardware.info > > to > > call sst_hsw_stream_set_silence_start() when PCM draining. > > > > Signed-off-by: Libin Yang <libin.yang@intel.com> > > --- > > sound/soc/intel/sst-haswell-pcm.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/sound/soc/intel/sst-haswell-pcm.c b/sound/soc/intel/sst- > > haswell-pcm.c > > index d6fa9d5..7e21e8f 100644 > > --- a/sound/soc/intel/sst-haswell-pcm.c > > +++ b/sound/soc/intel/sst-haswell-pcm.c > > @@ -91,7 +91,8 @@ static const struct snd_pcm_hardware > > hsw_pcm_hardware = { > > SNDRV_PCM_INFO_INTERLEAVED | > > SNDRV_PCM_INFO_PAUSE | > > SNDRV_PCM_INFO_RESUME | > > - > > SNDRV_PCM_INFO_NO_PERIOD_WAKEUP, > > + > > SNDRV_PCM_INFO_NO_PERIOD_WAKEUP | > > + SNDRV_PCM_INFO_DRAIN_TRIGGER, > > .formats = SNDRV_PCM_FMTBIT_S16_LE | > > SNDRV_PCM_FMTBIT_S24_LE | > > SNDRV_PCM_FMTBIT_S32_LE, > > .period_bytes_min = PAGE_SIZE, > > -- > > 1.9.1 >
Hi Takashi, > -----Original Message----- > From: Takashi Iwai [mailto:tiwai@suse.de] > Sent: Tuesday, February 17, 2015 2:51 PM > To: Yang, Libin > Cc: alsa-devel@alsa-project.org; broonie@sirena.org.uk; Girdwood, > Liam R; Jie, Yang > Subject: Re: [PATCH] ASoC: Intel: add > SNDRV_PCM_INFO_DRAIN_TRIGGER flag > > At Tue, 17 Feb 2015 04:53:45 +0000, > Yang, Libin wrote: > > > > Hi Takashi & Mark, > > > > This patch is for Takashi's tree. > > OK, I took it to for-linus (or for-next, equivalently) branch now. Got it. Thanks. > > > thanks, > > Takashi > > > > > Regards, > > Libin > > > > > > > -----Original Message----- > > > From: Yang, Libin > > > Sent: Tuesday, February 17, 2015 12:28 PM > > > To: alsa-devel@alsa-project.org; tiwai@suse.de; > > > broonie@sirena.org.uk > > > Cc: Girdwood, Liam R; Yang, Libin; Jie, Yang > > > Subject: [PATCH] ASoC: Intel: add > > > SNDRV_PCM_INFO_DRAIN_TRIGGER flag > > > > > > From: Libin Yang <libin.yang@intel.com> > > > > > > Add SNDRV_PCM_INFO_DRAIN_TRIGGER in > snd_pcm_hardware.info > > > to > > > call sst_hsw_stream_set_silence_start() when PCM draining. > > > > > > Signed-off-by: Libin Yang <libin.yang@intel.com> > > > --- > > > sound/soc/intel/sst-haswell-pcm.c | 3 ++- > > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > > > diff --git a/sound/soc/intel/sst-haswell-pcm.c > b/sound/soc/intel/sst- > > > haswell-pcm.c > > > index d6fa9d5..7e21e8f 100644 > > > --- a/sound/soc/intel/sst-haswell-pcm.c > > > +++ b/sound/soc/intel/sst-haswell-pcm.c > > > @@ -91,7 +91,8 @@ static const struct snd_pcm_hardware > > > hsw_pcm_hardware = { > > > SNDRV_PCM_INFO_INTERLEAVED | > > > SNDRV_PCM_INFO_PAUSE | > > > SNDRV_PCM_INFO_RESUME | > > > - > > > SNDRV_PCM_INFO_NO_PERIOD_WAKEUP, > > > + > > > SNDRV_PCM_INFO_NO_PERIOD_WAKEUP | > > > + SNDRV_PCM_INFO_DRAIN_TRIGGER, > > > .formats = SNDRV_PCM_FMTBIT_S16_LE | > > > SNDRV_PCM_FMTBIT_S24_LE | > > > SNDRV_PCM_FMTBIT_S32_LE, > > > .period_bytes_min = PAGE_SIZE, > > > -- > > > 1.9.1 > >
diff --git a/sound/soc/intel/sst-haswell-pcm.c b/sound/soc/intel/sst-haswell-pcm.c index d6fa9d5..7e21e8f 100644 --- a/sound/soc/intel/sst-haswell-pcm.c +++ b/sound/soc/intel/sst-haswell-pcm.c @@ -91,7 +91,8 @@ static const struct snd_pcm_hardware hsw_pcm_hardware = { SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME | - SNDRV_PCM_INFO_NO_PERIOD_WAKEUP, + SNDRV_PCM_INFO_NO_PERIOD_WAKEUP | + SNDRV_PCM_INFO_DRAIN_TRIGGER, .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE, .period_bytes_min = PAGE_SIZE,