diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-06-17 16:39:06 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-07-08 14:20:20 +0200 |
commit | cc6a8acdeee932f6911d8b236d2c7d6bcc4616f6 (patch) | |
tree | ebaadf1a406cf073fd4ce59d5f1f20d499f9cde1 /sound/core/memalloc.c | |
parent | 8e4a718ff38d8539938ec3421935904c27e00c39 (diff) | |
download | blackbird-op-linux-cc6a8acdeee932f6911d8b236d2c7d6bcc4616f6.tar.gz blackbird-op-linux-cc6a8acdeee932f6911d8b236d2c7d6bcc4616f6.zip |
ALSA: Fix SG-buffer DMA with non-coherent architectures
Using SG-buffers with dma_alloc_coherent() is often very inefficient
on non-coherent architectures because a tracking record could be
allocated in addition for each dma_alloc_coherent() call.
Instead, simply disable SG-buffers but just allocate normal continuous
buffers on non-supported (currently all but x86) architectures.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/memalloc.c')
-rw-r--r-- | sound/core/memalloc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index 1b3534d67686..9e92441f9b78 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -199,6 +199,8 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size, case SNDRV_DMA_TYPE_DEV: dmab->area = snd_malloc_dev_pages(device, size, &dmab->addr); break; +#endif +#ifdef CONFIG_SND_DMA_SGBUF case SNDRV_DMA_TYPE_DEV_SG: snd_malloc_sgbuf_pages(device, size, dmab, NULL); break; @@ -269,6 +271,8 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab) case SNDRV_DMA_TYPE_DEV: snd_free_dev_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr); break; +#endif +#ifdef CONFIG_SND_DMA_SGBUF case SNDRV_DMA_TYPE_DEV_SG: snd_free_sgbuf_pages(dmab); break; |