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/fence_gk20a.h | |
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/fence_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fence_gk20a.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.h b/drivers/gpu/nvgpu/gk20a/fence_gk20a.h index 5abf96e5..b4283f58 100644 --- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.h | |||
@@ -24,7 +24,7 @@ | |||
24 | struct platform_device; | 24 | struct platform_device; |
25 | struct sync_timeline; | 25 | struct sync_timeline; |
26 | struct sync_fence; | 26 | struct sync_fence; |
27 | struct gk20a_semaphore; | 27 | struct nvgpu_semaphore; |
28 | struct channel_gk20a; | 28 | struct channel_gk20a; |
29 | 29 | ||
30 | struct gk20a_fence_ops; | 30 | struct gk20a_fence_ops; |
@@ -38,7 +38,7 @@ struct gk20a_fence { | |||
38 | const struct gk20a_fence_ops *ops; | 38 | const struct gk20a_fence_ops *ops; |
39 | 39 | ||
40 | /* Valid for fences created from semaphores: */ | 40 | /* Valid for fences created from semaphores: */ |
41 | struct gk20a_semaphore *semaphore; | 41 | struct nvgpu_semaphore *semaphore; |
42 | wait_queue_head_t *semaphore_wq; | 42 | wait_queue_head_t *semaphore_wq; |
43 | 43 | ||
44 | /* Valid for fences created from syncpoints: */ | 44 | /* Valid for fences created from syncpoints: */ |
@@ -54,7 +54,7 @@ struct gk20a_fence { | |||
54 | int gk20a_fence_from_semaphore( | 54 | int gk20a_fence_from_semaphore( |
55 | struct gk20a_fence *fence_out, | 55 | struct gk20a_fence *fence_out, |
56 | struct sync_timeline *timeline, | 56 | struct sync_timeline *timeline, |
57 | struct gk20a_semaphore *semaphore, | 57 | struct nvgpu_semaphore *semaphore, |
58 | wait_queue_head_t *semaphore_wq, | 58 | wait_queue_head_t *semaphore_wq, |
59 | struct sync_fence *dependency, | 59 | struct sync_fence *dependency, |
60 | bool wfi, bool need_sync_fence); | 60 | bool wfi, bool need_sync_fence); |