diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2015-12-08 10:59:05 -0500 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-12-10 11:39:02 -0500 |
commit | 54f76d1ac6cf0ace524e073076578c891d1b3f79 (patch) | |
tree | eca77ff9dcb6d70c2b86815c6e2c59f92eabf5cb /drivers/gpu | |
parent | e04e73c580976445880283552535199a70a80ea4 (diff) |
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 <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/842999
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 6 |
1 files changed, 3 insertions, 3 deletions
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) | |||
421 | } | 421 | } |
422 | mutex_unlock(&ch->jobs_lock); | 422 | mutex_unlock(&ch->jobs_lock); |
423 | 423 | ||
424 | if (released_job_semaphore) { | 424 | if (released_job_semaphore) |
425 | wake_up_interruptible_all(&ch->semaphore_wq); | 425 | wake_up_interruptible_all(&ch->semaphore_wq); |
426 | gk20a_channel_update(ch, 0); | 426 | |
427 | } | 427 | gk20a_channel_update(ch, 0); |
428 | } | 428 | } |
429 | 429 | ||
430 | int gk20a_wait_channel_idle(struct channel_gk20a *ch) | 430 | int gk20a_wait_channel_idle(struct channel_gk20a *ch) |