From bd84f32885d1d24edb30013763626c37c124ecdd Mon Sep 17 00:00:00 2001 From: Bharat Nihalani Date: Thu, 6 May 2010 20:59:34 +0530 Subject: nvmap: re-enable use of IOVMM IOVMM was disabled due to problems with resume from LP0; re-enabling it since associated problems are now resolved. Following bugs will get fixed: Bug 680829 Bug 683310 Bug 596477 Change-Id: Idc9b5c87d4a4a7a36a682f367c0e2deb10cea41e Reviewed-on: http://git-master/r/1309 Reviewed-by: Mayuresh Kulkarni Tested-by: Mayuresh Kulkarni Reviewed-by: Gary King --- drivers/char/nvmap.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/char/nvmap.c b/drivers/char/nvmap.c index a92c38528ca8..0aed35a2c61d 100644 --- a/drivers/char/nvmap.c +++ b/drivers/char/nvmap.c @@ -47,9 +47,6 @@ #include "nvrm_memmgr.h" #include "nvbootargs.h" -/* TODO: [ahatala 2010-04-29] temporary workaround for GART LP0 problems */ -#define DISABLE_IOVMM - static void nvmap_vma_open(struct vm_area_struct *vma); static void nvmap_vma_close(struct vm_area_struct *vma); @@ -1831,9 +1828,6 @@ static int _nvmap_do_alloc(struct nvmap_file_priv *priv, /* can't do greater than page size alignment with page alloc */ if (align > PAGE_SIZE) heap_mask &= NVMEM_HEAP_CARVEOUT_MASK; -#ifdef DISABLE_IOVMM - heap_mask &= ~NVMEM_HEAP_IOVMM; -#endif while (heap_mask && !h->alloc) { unsigned int heap_type = _nvmap_heap_policy(heap_mask, numpages); -- cgit v1.2.3