* [PATCH] ALSA: ASoC: davinci-pcm: stub out gen_pool functions for !CONFIG_GENERIC_ALLOCATOR
@ 2012-10-10 12:49 Daniel Mack
2012-10-10 13:27 ` Daniel Mack
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Mack @ 2012-10-10 12:49 UTC (permalink / raw)
To: alsa-devel
Cc: Matt Porter, broonie, Hebbar, Gururaja, Anil Kumar, Daniel Mack,
lrg
On platforms without CONFIG_GENERIC_ALLOCATOR, these functions can be
no-ops. The code that uses the memory buffers does the right thing if
they are NULL.
Signed-off-by: Daniel Mack <zonque@gmail.com>
Cc: Hebbar, Gururaja <gururaja.hebbar@ti.com>
Cc: Matt Porter <mporter@ti.com>
Cc: Anil Kumar <anilkumar.v@ti.com>
---
Alternatively, the gen_pool functions could stub out themselves for
!CONFIG_GENERIC_ALLOCATOR.
sound/soc/davinci/davinci-pcm.c | 29 ++++++++++++++++++++++++-----
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c
index 01b3f17..afab81f 100644
--- a/sound/soc/davinci/davinci-pcm.c
+++ b/sound/soc/davinci/davinci-pcm.c
@@ -251,6 +251,7 @@ static void davinci_pcm_dma_irq(unsigned link, u16 ch_status, void *data)
}
}
+#ifdef CONFIG_GENERIC_ALLOCATOR
static int allocate_sram(struct snd_pcm_substream *substream,
struct gen_pool *sram_pool, unsigned size,
struct snd_pcm_hardware *ppcm)
@@ -284,6 +285,28 @@ exit1:
return -ENOMEM;
}
+static void davinci_free_sram(struct snd_pcm_substream *substream,
+ struct snd_dma_buffer *iram_dma)
+{
+ struct davinci_runtime_data *prtd = substream->runtime->private_data;
+ struct gen_pool *sram_pool = prtd->params->sram_pool;
+
+ gen_pool_free(sram_pool, (unsigned) iram_dma->area, iram_dma->bytes);
+}
+#else
+static int allocate_sram(struct snd_pcm_substream *substream,
+ struct gen_pool *sram_pool, unsigned size,
+ struct snd_pcm_hardware *ppcm)
+{
+ return 0;
+}
+
+static void davinci_free_sram(struct snd_pcm_substream *substream,
+ struct snd_dma_buffer *iram_dma)
+{
+}
+#endif
+
/*
* Only used with ping/pong.
* This is called after runtime->dma_addr, period_bytes and data_type are valid
@@ -813,11 +836,7 @@ static void davinci_pcm_free(struct snd_pcm *pcm)
buf->area = NULL;
iram_dma = buf->private_data;
if (iram_dma) {
- struct davinci_runtime_data *prtd =
- substream->runtime->private_data;
- struct gen_pool *sram_pool = prtd->params->sram_pool;
- gen_pool_free(sram_pool, (unsigned)iram_dma->area,
- iram_dma->bytes);
+ davinci_free_sram(substream, iram_dma);
kfree(iram_dma);
}
}
--
1.7.11.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] ALSA: ASoC: davinci-pcm: stub out gen_pool functions for !CONFIG_GENERIC_ALLOCATOR
2012-10-10 12:49 [PATCH] ALSA: ASoC: davinci-pcm: stub out gen_pool functions for !CONFIG_GENERIC_ALLOCATOR Daniel Mack
@ 2012-10-10 13:27 ` Daniel Mack
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Mack @ 2012-10-10 13:27 UTC (permalink / raw)
To: Daniel Mack
Cc: Matt Porter, alsa-devel, broonie, Hebbar, Gururaja, Anil Kumar,
lrg
On 10.10.2012 14:49, Daniel Mack wrote:
> On platforms without CONFIG_GENERIC_ALLOCATOR, these functions can be
> no-ops. The code that uses the memory buffers does the right thing if
> they are NULL.
To avoid confusion: this is meant to go on top of Matt Porter's two sram
related patches for this driver.
>
> Signed-off-by: Daniel Mack <zonque@gmail.com>
> Cc: Hebbar, Gururaja <gururaja.hebbar@ti.com>
> Cc: Matt Porter <mporter@ti.com>
> Cc: Anil Kumar <anilkumar.v@ti.com>
> ---
> Alternatively, the gen_pool functions could stub out themselves for
> !CONFIG_GENERIC_ALLOCATOR.
>
> sound/soc/davinci/davinci-pcm.c | 29 ++++++++++++++++++++++++-----
> 1 file changed, 24 insertions(+), 5 deletions(-)
>
> diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c
> index 01b3f17..afab81f 100644
> --- a/sound/soc/davinci/davinci-pcm.c
> +++ b/sound/soc/davinci/davinci-pcm.c
> @@ -251,6 +251,7 @@ static void davinci_pcm_dma_irq(unsigned link, u16 ch_status, void *data)
> }
> }
>
> +#ifdef CONFIG_GENERIC_ALLOCATOR
> static int allocate_sram(struct snd_pcm_substream *substream,
> struct gen_pool *sram_pool, unsigned size,
> struct snd_pcm_hardware *ppcm)
> @@ -284,6 +285,28 @@ exit1:
> return -ENOMEM;
> }
>
> +static void davinci_free_sram(struct snd_pcm_substream *substream,
> + struct snd_dma_buffer *iram_dma)
> +{
> + struct davinci_runtime_data *prtd = substream->runtime->private_data;
> + struct gen_pool *sram_pool = prtd->params->sram_pool;
> +
> + gen_pool_free(sram_pool, (unsigned) iram_dma->area, iram_dma->bytes);
> +}
> +#else
> +static int allocate_sram(struct snd_pcm_substream *substream,
> + struct gen_pool *sram_pool, unsigned size,
> + struct snd_pcm_hardware *ppcm)
> +{
> + return 0;
> +}
> +
> +static void davinci_free_sram(struct snd_pcm_substream *substream,
> + struct snd_dma_buffer *iram_dma)
> +{
> +}
> +#endif
> +
> /*
> * Only used with ping/pong.
> * This is called after runtime->dma_addr, period_bytes and data_type are valid
> @@ -813,11 +836,7 @@ static void davinci_pcm_free(struct snd_pcm *pcm)
> buf->area = NULL;
> iram_dma = buf->private_data;
> if (iram_dma) {
> - struct davinci_runtime_data *prtd =
> - substream->runtime->private_data;
> - struct gen_pool *sram_pool = prtd->params->sram_pool;
> - gen_pool_free(sram_pool, (unsigned)iram_dma->area,
> - iram_dma->bytes);
> + davinci_free_sram(substream, iram_dma);
> kfree(iram_dma);
> }
> }
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-10-10 13:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-10 12:49 [PATCH] ALSA: ASoC: davinci-pcm: stub out gen_pool functions for !CONFIG_GENERIC_ALLOCATOR Daniel Mack
2012-10-10 13:27 ` Daniel Mack
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).