From 2c615d68b835697f1c77dcb4f069ce5a84abd3d6 Mon Sep 17 00:00:00 2001 From: Arto Merilainen Date: Tue, 11 Mar 2014 15:09:32 +0200 Subject: gpu: nvgpu: Fall-back to 4k pages This patch modifies the code to fall-back to 4k pages if the current VA does not support 128k pages. Bug 1409151 Change-Id: I94e9ca5953740388db689bc9306b0392191e29d2 Signed-off-by: Arto Merilainen --- drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index 5440b3c2..c6883b61 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c @@ -1321,7 +1321,10 @@ u64 gk20a_vm_map(struct vm_gk20a *vm, bfr.pgsz_idx = NV_GMMU_VA_IS_UPPER(offset_align) ? gmmu_page_size_big : gmmu_page_size_small; } else { - gmmu_select_page_size(&bfr); + if (vm->big_pages) + gmmu_select_page_size(&bfr); + else + bfr.pgsz_idx = gmmu_page_size_small; } /* validate/adjust bfr attributes */ -- cgit v1.2.2