From e7a0c0ae8b6791c6b8ee30270ebdbe6e95fbbc71 Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Thu, 12 Jan 2017 19:18:21 -0800 Subject: gpu: nvgpu: Move from gk20a_ to nvgpu_ in semaphore code Change the prefix in the semaphore code to 'nvgpu_' since this code is global to all chips. Bug 1799159 Change-Id: Ic1f3e13428882019e5d1f547acfe95271cc10da5 Signed-off-by: Alex Waterman Reviewed-on: http://git-master/r/1284628 Reviewed-by: Varun Colbert Tested-by: Varun Colbert --- drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/mm_gk20a.c') 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) */ if (!gk20a_platform_has_syncpoints(gk20a_from_vm(vm)->dev)) { if (vm->sema_pool) { - gk20a_semaphore_pool_unmap(vm->sema_pool, vm); - gk20a_semaphore_pool_put(vm->sema_pool); + nvgpu_semaphore_pool_unmap(vm->sema_pool, vm); + nvgpu_semaphore_pool_put(vm->sema_pool); } } @@ -4180,7 +4180,7 @@ const struct gk20a_mmu_level gk20a_mm_levels_128k[] = { */ static int gk20a_init_sema_pool(struct vm_gk20a *vm) { - struct gk20a_semaphore_sea *sema_sea; + struct nvgpu_semaphore_sea *sema_sea; struct mm_gk20a *mm = vm->mm; struct gk20a *g = mm->g; int err; @@ -4194,11 +4194,11 @@ static int gk20a_init_sema_pool(struct vm_gk20a *vm) if (vm->sema_pool) return 0; - sema_sea = gk20a_semaphore_sea_create(g); + sema_sea = nvgpu_semaphore_sea_create(g); if (!sema_sea) return -ENOMEM; - vm->sema_pool = gk20a_semaphore_pool_alloc(sema_sea); + vm->sema_pool = nvgpu_semaphore_pool_alloc(sema_sea); if (!vm->sema_pool) return -ENOMEM; @@ -4220,9 +4220,9 @@ static int gk20a_init_sema_pool(struct vm_gk20a *vm) return -ENOMEM; } - err = gk20a_semaphore_pool_map(vm->sema_pool, vm); + err = nvgpu_semaphore_pool_map(vm->sema_pool, vm); if (err) { - gk20a_semaphore_pool_unmap(vm->sema_pool, vm); + nvgpu_semaphore_pool_unmap(vm->sema_pool, vm); nvgpu_free(vm->vma[gmmu_page_size_small], vm->sema_pool->gpu_va); return err; -- cgit v1.2.2