On 04/03/2013 11:19 AM, Laxman Dewangan wrote:
> Tegra PCM driver uses the dmaengine based DMA driver and Tegra DMA
> driver does not support the pause/resume functionality as hardware
> does not support it.
>
> ALSA driver support the sw based pause/resume functionality if hardware
> does not support it and in this case, hw driver should not provide
> the hardware info with PAUSE/RESUME bit enable.
>
> Remmoving the SNDRV_PCM_INFO_PAUSE and SNDRV_PCM_INFO_RESUME from hardware
> info and using the snd_dmaengine_pcm_trigger() for pcm_trigger callback.
>
> Signed-off-by: Laxman Dewangan <[email protected]>
Hm, I sent out the same patch just half an our or so ago.
- Lars
> ---
> Lars reported that if driver/chip dma driver does not support the pause/resume
> then need not to export this info through the hw capability and leave this
> implementation to alsa driver.
>
> Making the change accordingly.
>
> sound/soc/tegra/tegra_pcm.c | 24 +-----------------------
> 1 files changed, 1 insertions(+), 23 deletions(-)
>
> diff --git a/sound/soc/tegra/tegra_pcm.c b/sound/soc/tegra/tegra_pcm.c
> index e67af0b..117cccc 100644
> --- a/sound/soc/tegra/tegra_pcm.c
> +++ b/sound/soc/tegra/tegra_pcm.c
> @@ -43,8 +43,6 @@
> static const struct snd_pcm_hardware tegra_pcm_hardware = {
> .info = SNDRV_PCM_INFO_MMAP |
> SNDRV_PCM_INFO_MMAP_VALID |
> - SNDRV_PCM_INFO_PAUSE |
> - SNDRV_PCM_INFO_RESUME |
> SNDRV_PCM_INFO_INTERLEAVED,
> .formats = SNDRV_PCM_FMTBIT_S16_LE,
> .channels_min = 2,
> @@ -121,26 +119,6 @@ static int tegra_pcm_hw_free(struct snd_pcm_substream
> *substream)
> return 0;
> }
>
> -static int tegra_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
> -{
> - switch (cmd) {
> - case SNDRV_PCM_TRIGGER_START:
> - case SNDRV_PCM_TRIGGER_RESUME:
> - case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
> - return snd_dmaengine_pcm_trigger(substream,
> - SNDRV_PCM_TRIGGER_START);
> -
> - case SNDRV_PCM_TRIGGER_STOP:
> - case SNDRV_PCM_TRIGGER_SUSPEND:
> - case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
> - return snd_dmaengine_pcm_trigger(substream,
> - SNDRV_PCM_TRIGGER_STOP);
> - default:
> - return -EINVAL;
> - }
> - return 0;
> -}
> -
> static int tegra_pcm_mmap(struct snd_pcm_substream *substream,
> struct vm_area_struct *vma)
> {
> @@ -158,7 +136,7 @@ static struct snd_pcm_ops tegra_pcm_ops = {
> .ioctl = snd_pcm_lib_ioctl,
> .hw_params = tegra_pcm_hw_params,
> .hw_free = tegra_pcm_hw_free,
> - .trigger = tegra_pcm_trigger,
> + .trigger = snd_dmaengine_pcm_trigger,
> .pointer = snd_dmaengine_pcm_pointer,
> .mmap = tegra_pcm_mmap,
> };
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
