summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2017-03-08 20:08:50 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2017-03-30 15:36:09 -0400
commit24e1c7e0a729158be36d63b821550d206a8a0436 (patch)
treecf26c850cc63957f63f3e8f97914268839d8e0de /drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
parent7010bf88399ea81b2b35844f738baac19dc5a441 (diff)
gpu: nvgpu: Use new kmem API functions (misc)
Use the new kmem API functions in misc gk20a code. Some additional modifications were also made: o Add a struct gk20a pointer to gk20a_fence to enable proper kmem free usage. o Add gk20a pointer to alloc_session() in dbg_gpu_gk20a.c to use kmem API for allocating a session. o Plumb a gk20a pointer through the fence creation and deletion. o Use statically allocated buffers for names in file creation. Bug 1799159 Bug 1823380 Change-Id: I3678080e3ffa1f9bcf6934e3f4819a1bc531689b Signed-off-by: Alex Waterman <alexw@nvidia.com> Reviewed-on: http://git-master/r/1318323 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
index e84f70a2..8baf60dd 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
@@ -667,7 +667,7 @@ static int gk20a_channel_semaphore_wait_fd(
667 ret = __semaphore_wait_fd_fast_path(c, sync_fence, wait_cmd, &fp_sema); 667 ret = __semaphore_wait_fd_fast_path(c, sync_fence, wait_cmd, &fp_sema);
668 if (ret == 0) { 668 if (ret == 0) {
669 if (fp_sema) { 669 if (fp_sema) {
670 err = gk20a_fence_from_semaphore(fence, 670 err = gk20a_fence_from_semaphore(c->g, fence,
671 sema->timeline, 671 sema->timeline,
672 fp_sema, 672 fp_sema,
673 &c->semaphore_wq, 673 &c->semaphore_wq,
@@ -734,7 +734,7 @@ static int gk20a_channel_semaphore_wait_fd(
734 * that we properly clean up in the event the sync_fence has 734 * that we properly clean up in the event the sync_fence has
735 * already signaled 735 * already signaled
736 */ 736 */
737 err = gk20a_fence_from_semaphore(fence, sema->timeline, w->sema, 737 err = gk20a_fence_from_semaphore(c->g, fence, sema->timeline, w->sema,
738 &c->semaphore_wq, NULL, false, false); 738 &c->semaphore_wq, NULL, false, false);
739 if (err) 739 if (err)
740 goto clean_up_sema; 740 goto clean_up_sema;
@@ -810,7 +810,7 @@ static int __gk20a_channel_semaphore_incr(
810 /* Release the completion semaphore. */ 810 /* Release the completion semaphore. */
811 add_sema_cmd(c->g, c, semaphore, incr_cmd, 14, false, wfi_cmd); 811 add_sema_cmd(c->g, c, semaphore, incr_cmd, 14, false, wfi_cmd);
812 812
813 err = gk20a_fence_from_semaphore(fence, 813 err = gk20a_fence_from_semaphore(c->g, fence,
814 sp->timeline, semaphore, 814 sp->timeline, semaphore,
815 &c->semaphore_wq, 815 &c->semaphore_wq,
816 dependency, wfi_cmd, 816 dependency, wfi_cmd,