diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/mm_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index cafb1233..c62d1f6c 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -4096,8 +4096,8 @@ static void gk20a_vm_remove_support_nofree(struct vm_gk20a *vm) | |||
4096 | */ | 4096 | */ |
4097 | if (!gk20a_platform_has_syncpoints(gk20a_from_vm(vm)->dev)) { | 4097 | if (!gk20a_platform_has_syncpoints(gk20a_from_vm(vm)->dev)) { |
4098 | if (vm->sema_pool) { | 4098 | if (vm->sema_pool) { |
4099 | gk20a_semaphore_pool_unmap(vm->sema_pool, vm); | 4099 | nvgpu_semaphore_pool_unmap(vm->sema_pool, vm); |
4100 | gk20a_semaphore_pool_put(vm->sema_pool); | 4100 | nvgpu_semaphore_pool_put(vm->sema_pool); |
4101 | } | 4101 | } |
4102 | } | 4102 | } |
4103 | 4103 | ||
@@ -4180,7 +4180,7 @@ const struct gk20a_mmu_level gk20a_mm_levels_128k[] = { | |||
4180 | */ | 4180 | */ |
4181 | static int gk20a_init_sema_pool(struct vm_gk20a *vm) | 4181 | static int gk20a_init_sema_pool(struct vm_gk20a *vm) |
4182 | { | 4182 | { |
4183 | struct gk20a_semaphore_sea *sema_sea; | 4183 | struct nvgpu_semaphore_sea *sema_sea; |
4184 | struct mm_gk20a *mm = vm->mm; | 4184 | struct mm_gk20a *mm = vm->mm; |
4185 | struct gk20a *g = mm->g; | 4185 | struct gk20a *g = mm->g; |
4186 | int err; | 4186 | int err; |
@@ -4194,11 +4194,11 @@ static int gk20a_init_sema_pool(struct vm_gk20a *vm) | |||
4194 | if (vm->sema_pool) | 4194 | if (vm->sema_pool) |
4195 | return 0; | 4195 | return 0; |
4196 | 4196 | ||
4197 | sema_sea = gk20a_semaphore_sea_create(g); | 4197 | sema_sea = nvgpu_semaphore_sea_create(g); |
4198 | if (!sema_sea) | 4198 | if (!sema_sea) |
4199 | return -ENOMEM; | 4199 | return -ENOMEM; |
4200 | 4200 | ||
4201 | vm->sema_pool = gk20a_semaphore_pool_alloc(sema_sea); | 4201 | vm->sema_pool = nvgpu_semaphore_pool_alloc(sema_sea); |
4202 | if (!vm->sema_pool) | 4202 | if (!vm->sema_pool) |
4203 | return -ENOMEM; | 4203 | return -ENOMEM; |
4204 | 4204 | ||
@@ -4220,9 +4220,9 @@ static int gk20a_init_sema_pool(struct vm_gk20a *vm) | |||
4220 | return -ENOMEM; | 4220 | return -ENOMEM; |
4221 | } | 4221 | } |
4222 | 4222 | ||
4223 | err = gk20a_semaphore_pool_map(vm->sema_pool, vm); | 4223 | err = nvgpu_semaphore_pool_map(vm->sema_pool, vm); |
4224 | if (err) { | 4224 | if (err) { |
4225 | gk20a_semaphore_pool_unmap(vm->sema_pool, vm); | 4225 | nvgpu_semaphore_pool_unmap(vm->sema_pool, vm); |
4226 | nvgpu_free(vm->vma[gmmu_page_size_small], | 4226 | nvgpu_free(vm->vma[gmmu_page_size_small], |
4227 | vm->sema_pool->gpu_va); | 4227 | vm->sema_pool->gpu_va); |
4228 | return err; | 4228 | return err; |