From 54f76d1ac6cf0ace524e073076578c891d1b3f79 Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Tue, 8 Dec 2015 21:29:05 +0530 Subject: gpu: nvgpu: call channel_update() always in channel_abort() In gk20a_channel_abort(), we disable the channel and adjust the fences. And then we call gk20a_channel_update() only if we released the post-fence semaphore Instead of this, call gk20a_channel_update() always to ensure that all the clean up after fence completion is done always Bug 1683059 Change-Id: Ife00ba43e808c0833264d79c98c74417ffadf802 Signed-off-by: Deepak Nibade Reviewed-on: http://git-master/r/842999 Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/channel_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index cd05691a..7ec5ade4 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c @@ -421,10 +421,10 @@ void gk20a_channel_abort(struct channel_gk20a *ch) } mutex_unlock(&ch->jobs_lock); - if (released_job_semaphore) { + if (released_job_semaphore) wake_up_interruptible_all(&ch->semaphore_wq); - gk20a_channel_update(ch, 0); - } + + gk20a_channel_update(ch, 0); } int gk20a_wait_channel_idle(struct channel_gk20a *ch) -- cgit v1.2.2