From: Colin Cross <ccross@android.com>
Date: Wed, 20 Oct 2010 01:33:52 +0000 (-0700)
Subject: video: tegra: nvmap: Prevent reverting to sysmem for small allocations
X-Git-Tag: firefly_0821_release~9833^2~147^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bd5e7b5939316ebd8c063107b88cf89c53b37dc9;p=firefly-linux-kernel-4.4.55.git

video: tegra: nvmap: Prevent reverting to sysmem for small allocations

Change-Id: Icfe552ad4a968329a1a2959d5b438062587a83b6
Signed-off-by: Colin Cross <ccross@android.com>
---

diff --git a/drivers/video/tegra/nvmap/nvmap_handle.c b/drivers/video/tegra/nvmap/nvmap_handle.c
index 725a132ff6fd..2f50c0a1b8d3 100644
--- a/drivers/video/tegra/nvmap/nvmap_handle.c
+++ b/drivers/video/tegra/nvmap/nvmap_handle.c
@@ -149,8 +149,10 @@ static int handle_page_alloc(struct nvmap_client *client,
 
 	prot = nvmap_pgprot(h, pgprot_kernel);
 
+#ifdef CONFIG_NVMAP_ALLOW_SYSMEM
 	if (nr_page == 1)
 		contiguous = true;
+#endif
 
 	h->pgalloc.area = NULL;
 	if (contiguous) {