ALSA: pcm: Handle special page mapping in the default mmap handler

[linux-2.6-block.git] / sound / core / pcm_native.c

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 91c6ad58729fe7c8d6856a8f74b5ed547d19b179..998c63192ae4b8b906987c04574518e298abd02d 100644 (file)
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -13,6 +13,7 @@
 #include <linux/pm_qos.h>
 #include <linux/io.h>
 #include <linux/dma-mapping.h>
+#include <linux/vmalloc.h>
 #include <sound/core.h>
 #include <sound/control.h>
 #include <sound/info.h>
@@ -222,7 +223,8 @@ static bool hw_support_mmap(struct snd_pcm_substream *substream)
                return false;
 
        if (substream->ops->mmap ||
-           substream->dma_buffer.dev.type != SNDRV_DMA_TYPE_DEV)
+           (substream->dma_buffer.dev.type != SNDRV_DMA_TYPE_DEV &&
+            substream->dma_buffer.dev.type != SNDRV_DMA_TYPE_DEV_UC))
                return true;
 
        return dma_can_mmap(substream->dma_buffer.dev.dev);
@@ -3334,7 +3336,18 @@ static inline struct page *
 snd_pcm_default_page_ops(struct snd_pcm_substream *substream, unsigned long ofs)
 {
        void *vaddr = substream->runtime->dma_area + ofs;
-       return virt_to_page(vaddr);
+
+       switch (substream->dma_buffer.dev.type) {
+#ifdef CONFIG_SND_DMA_SGBUF
+       case SNDRV_DMA_TYPE_DEV_SG:
+       case SNDRV_DMA_TYPE_DEV_UC_SG:
+               return snd_pcm_sgbuf_ops_page(substream, ofs);
+#endif /* CONFIG_SND_DMA_SGBUF */
+       case SNDRV_DMA_TYPE_VMALLOC:
+               return vmalloc_to_page(vaddr);
+       default:
+               return virt_to_page(vaddr);
+       }
 }
 
 /*