gpu: nvgpu: use correct APIs for disable and preempt

In gr_gp10b_set_preemption_mode() and in gp10b_fifo_resetup_ramfc(),
we call channel specific APIs to disable/preempt/enable channel
But we do not consider TSGs in this case

Hence use correct (below) APIs in above function which
will handle channel or TSG internally :
gk20a_disable_channel_tsg()
gk20a_fifo_preempt()
gk20a_enable_channel_tsg()

Bug 200205041

Change-Id: I2369e79b2af3b8a91699044106293865d5f8f260
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1157192
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
index 89b5527d..aa38dc54 100644
--- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
@@ -156,10 +156,10 @@ static int gp10b_fifo_resetup_ramfc(struct channel_gk20a *c)
 
         if (new_syncpt && new_syncpt != old_syncpt) {
                 /* disable channel */
-                c->g->ops.fifo.disable_channel(c);
+                gk20a_disable_channel_tsg(c->g, c);
 
                 /* preempt the channel */
-                WARN_ON(c->g->ops.fifo.preempt_channel(c->g, c->hw_chid));
+                WARN_ON(gk20a_fifo_preempt(c->g, c));
 
                 v = pbdma_allowed_syncpoints_0_valid_f(1);
 
@@ -173,9 +173,7 @@ static int gp10b_fifo_resetup_ramfc(struct channel_gk20a *c)
         }
 
         /* enable channel */
-        gk20a_writel(c->g, ccsr_channel_r(c->hw_chid),
-                gk20a_readl(c->g, ccsr_channel_r(c->hw_chid)) |
-                ccsr_channel_enable_set_true_f());
+        gk20a_enable_channel_tsg(c->g, c);
 
         gk20a_dbg_fn("done");