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/channel_gk20a.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/channel_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index 3fa6bb25..b963ad96 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c @@ -515,7 +515,7 @@ void gk20a_channel_abort_clean_up(struct channel_gk20a *ch) while (tmp_get != put) { job = &ch->joblist.pre_alloc.jobs[tmp_get]; if (job->post_fence->semaphore) { - __gk20a_semaphore_release( + __nvgpu_semaphore_release( job->post_fence->semaphore, true); released_job_semaphore = true; } @@ -525,7 +525,7 @@ void gk20a_channel_abort_clean_up(struct channel_gk20a *ch) list_for_each_entry_safe(job, n, &ch->joblist.dynamic.jobs, list) { if (job->post_fence->semaphore) { - __gk20a_semaphore_release( + __nvgpu_semaphore_release( job->post_fence->semaphore, true); released_job_semaphore = true; } @@ -1006,7 +1006,7 @@ static void gk20a_free_channel(struct channel_gk20a *ch, bool force) * as the semaphore pool might get freed after that point. */ if (ch->hw_sema) - gk20a_semaphore_free_hw_sema(ch); + nvgpu_semaphore_free_hw_sema(ch); /* * When releasing the channel we unbind the VM - so release the ref. -- cgit v1.2.2