summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_gk20a.c8
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 65b17304..5befe086 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -216,8 +216,8 @@ void gk20a_channel_abort_clean_up(struct channel_gk20a *ch)
216 while (tmp_get != put) { 216 while (tmp_get != put) {
217 job = &ch->joblist.pre_alloc.jobs[tmp_get]; 217 job = &ch->joblist.pre_alloc.jobs[tmp_get];
218 if (job->post_fence->semaphore) { 218 if (job->post_fence->semaphore) {
219 __nvgpu_semaphore_release( 219 nvgpu_semaphore_reset(
220 job->post_fence->semaphore, true, 220 job->post_fence->semaphore,
221 ch->hw_sema); 221 ch->hw_sema);
222 released_job_semaphore = true; 222 released_job_semaphore = true;
223 } 223 }
@@ -228,8 +228,8 @@ void gk20a_channel_abort_clean_up(struct channel_gk20a *ch)
228 &ch->joblist.dynamic.jobs, 228 &ch->joblist.dynamic.jobs,
229 channel_gk20a_job, list) { 229 channel_gk20a_job, list) {
230 if (job->post_fence->semaphore) { 230 if (job->post_fence->semaphore) {
231 __nvgpu_semaphore_release( 231 nvgpu_semaphore_reset(
232 job->post_fence->semaphore, true, 232 job->post_fence->semaphore,
233 ch->hw_sema); 233 ch->hw_sema);
234 released_job_semaphore = true; 234 released_job_semaphore = true;
235 } 235 }
diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
index e94a112f..d87b8661 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
@@ -410,7 +410,7 @@ static void add_sema_cmd(struct gk20a *g, struct channel_gk20a *c,
410 * incr the underlying sema next_value. 410 * incr the underlying sema next_value.
411 */ 411 */
412 if (!acquire) 412 if (!acquire)
413 nvgpu_semaphore_incr(s, c->hw_sema); 413 nvgpu_semaphore_prepare(s, c->hw_sema);
414 414
415 /* semaphore_a */ 415 /* semaphore_a */
416 nvgpu_mem_wr32(g, cmd->mem, off++, 0x20010004); 416 nvgpu_mem_wr32(g, cmd->mem, off++, 0x20010004);