diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/mm/vm_area.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/vm_area.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/common/mm/vm_area.c b/drivers/gpu/nvgpu/common/mm/vm_area.c index b8fecbfc..7e2b5c34 100644 --- a/drivers/gpu/nvgpu/common/mm/vm_area.c +++ b/drivers/gpu/nvgpu/common/mm/vm_area.c | |||
@@ -43,7 +43,7 @@ struct nvgpu_vm_area *nvgpu_vm_area_find(struct vm_gk20a *vm, u64 addr) | |||
43 | } | 43 | } |
44 | 44 | ||
45 | int nvgpu_vm_area_validate_buffer(struct vm_gk20a *vm, | 45 | int nvgpu_vm_area_validate_buffer(struct vm_gk20a *vm, |
46 | u64 map_addr, u64 map_size, int pgsz_idx, | 46 | u64 map_addr, u64 map_size, u32 pgsz_idx, |
47 | struct nvgpu_vm_area **pvm_area) | 47 | struct nvgpu_vm_area **pvm_area) |
48 | { | 48 | { |
49 | struct gk20a *g = vm->mm->g; | 49 | struct gk20a *g = vm->mm->g; |
@@ -99,19 +99,19 @@ int nvgpu_vm_area_alloc(struct vm_gk20a *vm, u32 pages, u32 page_size, | |||
99 | struct nvgpu_allocator *vma; | 99 | struct nvgpu_allocator *vma; |
100 | struct nvgpu_vm_area *vm_area; | 100 | struct nvgpu_vm_area *vm_area; |
101 | u64 vaddr_start = 0; | 101 | u64 vaddr_start = 0; |
102 | int pgsz_idx = gmmu_page_size_small; | 102 | u32 pgsz_idx = GMMU_PAGE_SIZE_SMALL; |
103 | 103 | ||
104 | nvgpu_log(g, gpu_dbg_map, | 104 | nvgpu_log(g, gpu_dbg_map, |
105 | "ADD vm_area: pgsz=%#-8x pages=%-9u addr=%#-14llx flags=0x%x", | 105 | "ADD vm_area: pgsz=%#-8x pages=%-9u addr=%#-14llx flags=0x%x", |
106 | page_size, pages, *addr, flags); | 106 | page_size, pages, *addr, flags); |
107 | 107 | ||
108 | for (; pgsz_idx < gmmu_nr_page_sizes; pgsz_idx++) { | 108 | for (; pgsz_idx < GMMU_NR_PAGE_SIZES; pgsz_idx++) { |
109 | if (vm->gmmu_page_sizes[pgsz_idx] == page_size) { | 109 | if (vm->gmmu_page_sizes[pgsz_idx] == page_size) { |
110 | break; | 110 | break; |
111 | } | 111 | } |
112 | } | 112 | } |
113 | 113 | ||
114 | if (pgsz_idx > gmmu_page_size_big) { | 114 | if (pgsz_idx > GMMU_PAGE_SIZE_BIG) { |
115 | return -EINVAL; | 115 | return -EINVAL; |
116 | } | 116 | } |
117 | 117 | ||
@@ -122,7 +122,7 @@ int nvgpu_vm_area_alloc(struct vm_gk20a *vm, u32 pages, u32 page_size, | |||
122 | */ | 122 | */ |
123 | nvgpu_speculation_barrier(); | 123 | nvgpu_speculation_barrier(); |
124 | 124 | ||
125 | if (!vm->big_pages && pgsz_idx == gmmu_page_size_big) { | 125 | if (!vm->big_pages && pgsz_idx == GMMU_PAGE_SIZE_BIG) { |
126 | return -EINVAL; | 126 | return -EINVAL; |
127 | } | 127 | } |
128 | 128 | ||