From 7095a72e563b5d7969c5f09053e469906362428f Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Wed, 23 Dec 2015 15:15:45 -0800 Subject: 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 Reviewed-on: http://git-master/r/926571 GVS: Gerrit_Virtual_Submit Reviewed-by: Aingara Paramakuru Reviewed-by: Deepak Nibade Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 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) ch->g->ops.fifo.disable_channel(ch); if (channel_preempt) - ch->g->ops.fifo.preempt_channel(ch->g, ch->hw_chid); + gk20a_fifo_preempt(ch->g, ch); /* ensure no fences are pending */ mutex_lock(&ch->sync_lock); -- cgit v1.2.2