diff options
author | Alex Waterman <alexw@nvidia.com> | 2017-01-12 22:18:21 -0500 |
---|---|---|
committer | Varun Colbert <vcolbert@nvidia.com> | 2017-02-13 21:15:03 -0500 |
commit | e7a0c0ae8b6791c6b8ee30270ebdbe6e95fbbc71 (patch) | |
tree | 0f62852593ad151cc716e258ece88fb5da30a3ae /drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |
parent | aa36d3786aeed6755b9744fed37aad000b582322 (diff) |
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 <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1284628
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/channel_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 6 |
1 files changed, 3 insertions, 3 deletions
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) | |||
515 | while (tmp_get != put) { | 515 | while (tmp_get != put) { |
516 | job = &ch->joblist.pre_alloc.jobs[tmp_get]; | 516 | job = &ch->joblist.pre_alloc.jobs[tmp_get]; |
517 | if (job->post_fence->semaphore) { | 517 | if (job->post_fence->semaphore) { |
518 | __gk20a_semaphore_release( | 518 | __nvgpu_semaphore_release( |
519 | job->post_fence->semaphore, true); | 519 | job->post_fence->semaphore, true); |
520 | released_job_semaphore = true; | 520 | released_job_semaphore = true; |
521 | } | 521 | } |
@@ -525,7 +525,7 @@ void gk20a_channel_abort_clean_up(struct channel_gk20a *ch) | |||
525 | list_for_each_entry_safe(job, n, | 525 | list_for_each_entry_safe(job, n, |
526 | &ch->joblist.dynamic.jobs, list) { | 526 | &ch->joblist.dynamic.jobs, list) { |
527 | if (job->post_fence->semaphore) { | 527 | if (job->post_fence->semaphore) { |
528 | __gk20a_semaphore_release( | 528 | __nvgpu_semaphore_release( |
529 | job->post_fence->semaphore, true); | 529 | job->post_fence->semaphore, true); |
530 | released_job_semaphore = true; | 530 | released_job_semaphore = true; |
531 | } | 531 | } |
@@ -1006,7 +1006,7 @@ static void gk20a_free_channel(struct channel_gk20a *ch, bool force) | |||
1006 | * as the semaphore pool might get freed after that point. | 1006 | * as the semaphore pool might get freed after that point. |
1007 | */ | 1007 | */ |
1008 | if (ch->hw_sema) | 1008 | if (ch->hw_sema) |
1009 | gk20a_semaphore_free_hw_sema(ch); | 1009 | nvgpu_semaphore_free_hw_sema(ch); |
1010 | 1010 | ||
1011 | /* | 1011 | /* |
1012 | * When releasing the channel we unbind the VM - so release the ref. | 1012 | * When releasing the channel we unbind the VM - so release the ref. |