summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_gk20a.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index de51e83e..28b0bbc7 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * GK20A Graphics channel 2 * GK20A Graphics channel
3 * 3 *
4 * Copyright (c) 2011-2014, NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2011-2015, NVIDIA CORPORATION. All rights reserved.
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify it 6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms and conditions of the GNU General Public License, 7 * under the terms and conditions of the GNU General Public License,
@@ -419,8 +419,10 @@ void gk20a_channel_abort(struct channel_gk20a *ch)
419 bool released_job_semaphore = false; 419 bool released_job_semaphore = false;
420 420
421 /* ensure no fences are pending */ 421 /* ensure no fences are pending */
422 mutex_lock(&ch->submit_lock);
422 if (ch->sync) 423 if (ch->sync)
423 ch->sync->set_min_eq_max(ch->sync); 424 ch->sync->set_min_eq_max(ch->sync);
425 mutex_unlock(&ch->submit_lock);
424 426
425 /* release all job semaphores (applies only to jobs that use 427 /* release all job semaphores (applies only to jobs that use
426 semaphore synchronization) */ 428 semaphore synchronization) */