gpu: nvgpu: use correct APIs for disable and preempt

In gr_gk20a_ctx_zcull_setup(), gr_gk20a_update_smpc_ctxsw_mode(),
and in gk20a_channel_suspend(), 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 functions which
will handle channel or TSG internally :
gk20a_disable_channel_tsg()
gk20a_fifo_preempt()
gk20a_enable_channel_tsg()

Bug 200205041

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

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 64a14f8e..b1d9fa55 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -2772,9 +2772,9 @@ int gk20a_channel_suspend(struct gk20a *g)
                 if (gk20a_channel_get(ch)) {
                         gk20a_dbg_info("suspend channel %d", chid);
                         /* disable channel */
-                        g->ops.fifo.disable_channel(ch);
+                        gk20a_disable_channel_tsg(g, ch);
                         /* preempt the channel */
-                        g->ops.fifo.preempt_channel(g, chid);
+                        gk20a_fifo_preempt(g, ch);
                         gk20a_channel_cancel_job_clean_up(ch, true);
                         /* wait for channel update notifiers */
                         if (ch->update_fn)