summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/fence_gk20a.c
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2016-06-09 17:41:24 -0400
committerTerje Bergstrom <tbergstrom@nvidia.com>2016-06-14 17:01:10 -0400
commit5900fbd9540ee067f755197025fcb0b060131bd9 (patch)
tree318b3a02c5b8308529647654f2981ec16d2e6ff6 /drivers/gpu/nvgpu/gk20a/fence_gk20a.c
parent4e21f4a148c94982bbbd7be18c272b06738918e9 (diff)
gpu: nvgpu: Export and rename alloc_fence
Rename alloc_fence() to gk20a_alloc_fence() and allow this function to be called by the channel_sync_gk20a.c code. Bug 1732449 JIRA DNVGPU-12 Change-Id: Ic17131db2c8545832a2e8caacbd092cf970af4d1 Signed-off-by: Alex Waterman <alexw@nvidia.com> Reviewed-on: http://git-master/r/1162687 Reviewed-by: David Martinez Nieto <dmartineznie@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fence_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/fence_gk20a.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c
index fe38ae57..23522882 100644
--- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c
@@ -98,8 +98,8 @@ int gk20a_fence_install_fd(struct gk20a_fence *f)
98#endif 98#endif
99} 99}
100 100
101static struct gk20a_fence *alloc_fence(const struct gk20a_fence_ops *ops, 101struct gk20a_fence *gk20a_alloc_fence(const struct gk20a_fence_ops *ops,
102 struct sync_fence *sync_fence, bool wfi) 102 struct sync_fence *sync_fence, bool wfi)
103{ 103{
104 struct gk20a_fence *f = kzalloc(sizeof(*f), GFP_KERNEL); 104 struct gk20a_fence *f = kzalloc(sizeof(*f), GFP_KERNEL);
105 if (!f) 105 if (!f)
@@ -161,7 +161,7 @@ struct gk20a_fence *gk20a_fence_from_semaphore(
161 return NULL; 161 return NULL;
162#endif 162#endif
163 163
164 f = alloc_fence(&gk20a_semaphore_fence_ops, sync_fence, wfi); 164 f = gk20a_alloc_fence(&gk20a_semaphore_fence_ops, sync_fence, wfi);
165 if (!f) { 165 if (!f) {
166#ifdef CONFIG_SYNC 166#ifdef CONFIG_SYNC
167 sync_fence_put(sync_fence); 167 sync_fence_put(sync_fence);
@@ -216,7 +216,7 @@ struct gk20a_fence *gk20a_fence_from_syncpt(struct platform_device *host1x_pdev,
216 } 216 }
217#endif 217#endif
218 218
219 f = alloc_fence(&gk20a_syncpt_fence_ops, sync_fence, wfi); 219 f = gk20a_alloc_fence(&gk20a_syncpt_fence_ops, sync_fence, wfi);
220 if (!f) { 220 if (!f) {
221#ifdef CONFIG_SYNC 221#ifdef CONFIG_SYNC
222 if (sync_fence) 222 if (sync_fence)