alsa sound support for mips
PATCH 16/16 alsa sound support for mips
Signed-off-by Fuxin Zhang <[email protected]>
--- sound/core/pcm_native.c | 10 ++++++++++ sound/core/sgbuf.c | 9 +++++++++ 2 files changed, 19 insertions(+), 0 deletions(-)
sound/core/pcm_native.c +10 -0
@@ -3145,7 +3145,11 @@ static struct page *snd_pcm_mmap_data_nopage(struct vm_area_struct *area,return NOPAGE_OOM ;/* XXX: is this really due to OOM? */ }else { vaddr = runtime->dma_area + offset; +#if defined(__mips__) && defined(CONFIG_DMA_NONCOHERENT ) + page =virt_to_page (CAC_ADDR (vaddr)); +#else page =virt_to_page (vaddr); +#endif }get_page (page);if (type)
@@ -3261,6 +3265,12 @@ static int snd_pcm_mmap(struct file *file, struct vm_area_struct *area) substream = pcm_file->substream;snd_assert (substream !=NULL , return -ENXIO ); +#if defined(__mips__) && defined(CONFIG_DMA_NONCOHERENT ) +/* all mmap using uncached mode */ + area->vm_page_prot =pgprot_noncached (area->vm_page_prot); + area->vm_flags |= (VM_RESERVED |VM_IO ); +#endif + offset = area->vm_pgoff <<PAGE_SHIFT ;switch (offset) {case SNDRV_PCM_MMAP_OFFSET_STATUS :
sound/core/sgbuf.c +9 -0
@@ -91,12 +91,21 @@ void *snd_malloc_sgbuf_pages(struct device *device, } sgbuf->table[i].buf = tmpb.area; sgbuf->table[i].addr = tmpb.addr; +#if defined(__mips__) && defined(CONFIG_DMA_NONCOHERENT ) + sgbuf->page_table[i] =virt_to_page (CAC_ADDR (tmpb.area)); +#else sgbuf->page_table[i] =virt_to_page (tmpb.area); +#endif sgbuf->pages++; } sgbuf->size = size; +#if defined(__mips__) && defined(CONFIG_DMA_NONCOHERENT ) +/* maybe we should use uncached accelerated mode */ + dmab->area =vmap (sgbuf->page_table, sgbuf->pages,VM_MAP |VM_IO ,pgprot_noncached (PAGE_KERNEL )); +#else dmab->area =vmap (sgbuf->page_table, sgbuf->pages,VM_MAP ,PAGE_KERNEL ); +#endif if (! dmab->area) goto _failed;return dmab->area;
Signature · 1 line
1.4.4.4