mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 13:29:33 +00:00
29 lines
928 B
Diff
29 lines
928 B
Diff
From 32d5826ec939e62d5c39461fb3cc4d7a54ac56e5 Mon Sep 17 00:00:00 2001
|
|
From: Marek Szyprowski <m.szyprowski@samsung.com>
|
|
Date: Wed, 15 Feb 2017 14:08:49 +0100
|
|
Subject: [PATCH 07/24] MEMEKA: ARM: dma-mapping: add support for
|
|
non-consistent dma_mmap
|
|
|
|
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
|
|
Signed-off-by: memeka <mihailescu2m@gmail.com>
|
|
---
|
|
arch/arm/mm/dma-mapping.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
|
|
index 80d4e66039ff..afaf2e91b0bc 100644
|
|
--- a/arch/arm/mm/dma-mapping.c
|
|
+++ b/arch/arm/mm/dma-mapping.c
|
|
@@ -567,7 +567,8 @@ static inline pgprot_t __get_dma_pgprot(unsigned long attrs, pgprot_t prot)
|
|
{
|
|
prot = (attrs & DMA_ATTR_WRITE_COMBINE) ?
|
|
pgprot_writecombine(prot) :
|
|
- pgprot_dmacoherent(prot);
|
|
+ (attrs & DMA_ATTR_NON_CONSISTENT) ?
|
|
+ prot : pgprot_dmacoherent(prot);
|
|
return prot;
|
|
}
|
|
|
|
--
|
|
2.20.1
|
|
|