From b86f8d95e5922312a72182b06aa838593db8adef Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 26 Nov 2009 15:04:24 +0100 Subject: [PATCH] --- yaml --- r: 170087 b: refs/heads/master c: 6985c8877a711c7c307af05203858cb7c3c89d0d h: refs/heads/master i: 170085: 451ad699b37c4d61c1927f8208130a7393360a78 170083: acc370dd64fdf29a5a8d4e2593874a942fd90aa0 170079: a5c22544d57f6df9b1d607a98b01ccb7843b4a2f v: v3 --- [refs] | 2 +- trunk/sound/core/pcm_native.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a09b6b870e7f..a01e7bafa550 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66b6cfacfc5aa2fda37b0d40cd54931ca5ef8cd7 +refs/heads/master: 6985c8877a711c7c307af05203858cb7c3c89d0d diff --git a/trunk/sound/core/pcm_native.c b/trunk/sound/core/pcm_native.c index e48c5f618578..29ab46a12e11 100644 --- a/trunk/sound/core/pcm_native.c +++ b/trunk/sound/core/pcm_native.c @@ -3069,6 +3069,16 @@ snd_pcm_default_page_ops(struct snd_pcm_substream *substream, unsigned long ofs) #if defined(CONFIG_MIPS) && defined(CONFIG_DMA_NONCOHERENT) if (substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV) return virt_to_page(CAC_ADDR(vaddr)); +#endif +#if defined(CONFIG_PPC32) && defined(CONFIG_NOT_COHERENT_CACHE) + if (substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV) { + dma_addr_t addr = substream->runtime->dma_addr + ofs; + addr -= get_dma_offset(substream->dma_buffer.dev.dev); + /* assume dma_handle set via pfn_to_phys() in + * mm/dma-noncoherent.c + */ + return pfn_to_page(addr >> PAGE_SHIFT); + } #endif return virt_to_page(vaddr); }