diff options
author | Richard Zhao <rizhao@nvidia.com> | 2015-12-23 18:15:45 -0500 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-01-19 11:34:55 -0500 |
commit | 7095a72e563b5d7969c5f09053e469906362428f (patch) | |
tree | 8723d3bddfd650c5f89aa51393cf8ee6f8be4bc2 /drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |
parent | b9cbb12132b52c268b3f727f50416efd75fead0f (diff) |
gpu: nvgpu: fix tsg bugs
- correct runlist entry type for tsg
- consider tsg when preempt channel
Bug 1617046
Change-Id: Ie067df17fb53ae91c49403637a5f35fc3710e0b3
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: http://git-master/r/926571
GVS: Gerrit_Virtual_Submit
Reviewed-by: Aingara Paramakuru <aparamakuru@nvidia.com>
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/channel_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index f34df520..0c28d0bb 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
@@ -487,7 +487,7 @@ void gk20a_channel_abort(struct channel_gk20a *ch, bool channel_preempt) | |||
487 | ch->g->ops.fifo.disable_channel(ch); | 487 | ch->g->ops.fifo.disable_channel(ch); |
488 | 488 | ||
489 | if (channel_preempt) | 489 | if (channel_preempt) |
490 | ch->g->ops.fifo.preempt_channel(ch->g, ch->hw_chid); | 490 | gk20a_fifo_preempt(ch->g, ch); |
491 | 491 | ||
492 | /* ensure no fences are pending */ | 492 | /* ensure no fences are pending */ |
493 | mutex_lock(&ch->sync_lock); | 493 | mutex_lock(&ch->sync_lock); |