From 6a319070d30e2a25805fcd9278a4f10736ee1dea Mon Sep 17 00:00:00 2001 From: Peter Gielda Date: Mon, 6 May 2013 13:13:02 +0200 Subject: Revert "tegra_v4l2: map memory as non-cachable and fix the allocation problem" This reverts commit 080c3135b58aa700851991fb672e6c33cf16d9d9. --- drivers/media/video/videobuf2-dma-nvmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- cgit v1.2.3