summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Gielda <pgielda@antmicro.com>2013-05-06 13:13:02 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2013-06-12 21:43:53 +0200
commit6a319070d30e2a25805fcd9278a4f10736ee1dea (patch)
treedd6453ba9186b827a0a0f4491275966ca6931668
parentd359ee198388214a8aa4c320a539a2aae2de1536 (diff)
Revert "tegra_v4l2: map memory as non-cachable and fix the allocation problem"
This reverts commit 080c3135b58aa700851991fb672e6c33cf16d9d9.
-rw-r--r--drivers/media/video/videobuf2-dma-nvmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/videobuf2-dma-nvmap.c b/drivers/media/video/videobuf2-dma-nvmap.c
index 99413e119d22..27f43e5a3a57 100644
--- a/drivers/media/video/videobuf2-dma-nvmap.c
+++ b/drivers/media/video/videobuf2-dma-nvmap.c
@@ -54,7 +54,7 @@ static void *vb2_dma_nvmap_alloc(void *alloc_ctx, unsigned long size)
}
buf->nvmap_ref = nvmap_alloc(conf->nvmap_client, size, 32,
- NVMAP_HANDLE_UNCACHEABLE, NVMAP_HEAP_SYSMEM | NVMAP_HEAP_CARVEOUT_GENERIC);
+ NVMAP_HANDLE_CACHEABLE, NVMAP_HEAP_SYSMEM);
if (IS_ERR(buf->nvmap_ref)) {
dev_err(conf->dev, "nvmap_alloc failed\n");
ret = -ENOMEM;