From 1b125d8cbe05766c0cfb0ba9cac2bf46ffef7c3a Mon Sep 17 00:00:00 2001 From: David Nieto Date: Thu, 30 Nov 2017 11:05:14 -0800 Subject: gpu: nvgpu: fix indexing in locate pte function The current code does not properly calculate the indexes within the PDE to access the proper entry, and it has a bug in assignement of the big page entries. This change fixes the issue by: (1) Passing a pointer to the level structure and dereferencing the index offset to the next level. (2) Changing the format of the address. (3) Ensuring big pages are only selected if their address is set. Bug 200364599 Change-Id: I46e32560ee341d8cfc08c077282dcb5549d2a140 Signed-off-by: David Nieto Reviewed-on: https://git-master.nvidia.com/r/1610562 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Deepak Bhosale --- drivers/gpu/nvgpu/common/mm/gmmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/common/mm') diff --git a/drivers/gpu/nvgpu/common/mm/gmmu.c b/drivers/gpu/nvgpu/common/mm/gmmu.c index 62c84e96..22f73083 100644 --- a/drivers/gpu/nvgpu/common/mm/gmmu.c +++ b/drivers/gpu/nvgpu/common/mm/gmmu.c @@ -838,7 +838,7 @@ static int __nvgpu_locate_pte(struct gk20a *g, struct vm_gk20a *vm, if (!pd_next->mem) return -EINVAL; - attrs->pgsz = l->get_pgsz(g, pd, pd_idx); + attrs->pgsz = l->get_pgsz(g, l, pd, pd_idx); if (attrs->pgsz >= gmmu_nr_page_sizes) return -EINVAL; -- cgit v1.2.2