summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/nvrm
diff options
context:
space:
mode:
authorGary King <gking@nvidia.com>2010-02-10 20:22:01 -0800
committerGary King <gking@nvidia.com>2010-02-11 22:09:19 -0800
commitd3a9ee2f80cdcb00c4f8187b0c2d3fc8bf879cb0 (patch)
tree3b70e6c123ec0d8ad81dd756df376c52a27d39ac /arch/arm/mach-tegra/nvrm
parent78f2628cc6f65b320d24df9612bf94932406a81b (diff)
tegra rm: map memory handles writecombined
the drivers are written to behave correctly with writecombined memory, rather than SO, and SO mappings are really, really slow Change-Id: I6ab9e4f506bbefed5d6d0ec7de36b78ee3b39c42
Diffstat (limited to 'arch/arm/mach-tegra/nvrm')
-rw-r--r--arch/arm/mach-tegra/nvrm/core/common/nvrm_memmgr.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/nvrm/core/common/nvrm_memmgr.c b/arch/arm/mach-tegra/nvrm/core/common/nvrm_memmgr.c
index 3571b7020e69..08997f589a60 100644
--- a/arch/arm/mach-tegra/nvrm/core/common/nvrm_memmgr.c
+++ b/arch/arm/mach-tegra/nvrm/core/common/nvrm_memmgr.c
@@ -283,9 +283,8 @@ NvError NvRmMemAlloc(
/* FIXME: Windows should support full caching for memory handles.
* But not yet.
*/
-#if !NVOS_IS_LINUX
- Coherency = NvOsMemAttribute_Uncached;
-#endif
+ if (Coherency == NvOsMemAttribute_Uncached)
+ Coherency = NvOsMemAttribute_WriteCombined;
if (NV_RM_HMEM_IS_ALLOCATED(hMem))
return NvError_AlreadyAllocated;