summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/nvmap/nvmap_handle.c
diff options
context:
space:
mode:
authorKrishna Reddy <vdumpa@nvidia.com>2012-02-22 15:57:46 -0800
committerSimone Willett <swillett@nvidia.com>2012-02-24 17:57:05 -0800
commitf6e8966fbbe4aa617f7284fe95b0a720498e4d4a (patch)
tree593e1c908fc261dfb1b8a2432566d72e73d03216 /drivers/video/tegra/nvmap/nvmap_handle.c
parentcb0428145196ed7a75861c78d28f46b6bc8d2320 (diff)
video: tegra: nvmap: don't override contiguous flag
Don't override contiguous flag in nvmap_page_alloc(). This is causing incorrect iovm_commit accounting. Bug 938864 Change-Id: If30ea43702465980914b12816fa28eac9e14581d Signed-off-by: Krishna Reddy <vdumpa@nvidia.com> Reviewed-on: http://git-master/r/85319 Reviewed-by: Scott Williams <scwilliams@nvidia.com> Reviewed-by: Kamal Balagopalan <kbalagopalan@nvidia.com> Tested-by: Kamal Balagopalan <kbalagopalan@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/nvmap/nvmap_handle.c')
-rw-r--r--drivers/video/tegra/nvmap/nvmap_handle.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/video/tegra/nvmap/nvmap_handle.c b/drivers/video/tegra/nvmap/nvmap_handle.c
index 87d2407004bc..b83a7896eeb3 100644
--- a/drivers/video/tegra/nvmap/nvmap_handle.c
+++ b/drivers/video/tegra/nvmap/nvmap_handle.c
@@ -159,11 +159,6 @@ 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) {
struct page *page;