gpu: nvgpu: support platform specific TSG enable/disable

Add platform specific operations to enable/disable a TSG and use them instead
of directly calling enable/disable APIs

For gm20b/gp106/gp10b we continue to use gk20a_enable_tsg() and
gk20a_disable_tsg() as platform specific operations

Bug 1739362

Change-Id: I2dd0f38c8303757e8c7a47d8da0e30a790e514f0
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1560635
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

8 files changed, 17 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c b/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c
index d35ea14c..10379633 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c
@@ -409,7 +409,7 @@ long nvgpu_ioctl_tsg_dev_ioctl(struct file *filp, unsigned int cmd,
                            "failed to host gk20a for ioctl cmd: 0x%x", cmd);
                         return err;
                 }
-                gk20a_enable_tsg(tsg);
+                g->ops.fifo.enable_tsg(tsg);
                 gk20a_idle(g);
                 break;
                 }
@@ -422,7 +422,7 @@ long nvgpu_ioctl_tsg_dev_ioctl(struct file *filp, unsigned int cmd,
                            "failed to host gk20a for ioctl cmd: 0x%x", cmd);
                         return err;
                 }
-                gk20a_disable_tsg(tsg);
+                g->ops.fifo.disable_tsg(tsg);
                 gk20a_idle(g);
                 break;
                 }
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 89862e63..d0d5c41f 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -200,7 +200,7 @@ int gk20a_enable_channel_tsg(struct gk20a *g, struct channel_gk20a *ch)
 
         if (gk20a_is_channel_marked_as_tsg(ch)) {
                 tsg = &g->fifo.tsg[ch->tsgid];
-                gk20a_enable_tsg(tsg);
+                g->ops.fifo.enable_tsg(tsg);
         } else {
                 g->ops.fifo.enable_channel(ch);
         }
@@ -214,7 +214,7 @@ int gk20a_disable_channel_tsg(struct gk20a *g, struct channel_gk20a *ch)
 
         if (gk20a_is_channel_marked_as_tsg(ch)) {
                 tsg = &g->fifo.tsg[ch->tsgid];
-                gk20a_disable_tsg(tsg);
+                g->ops.fifo.disable_tsg(tsg);
         } else {
                 g->ops.fifo.disable_channel(ch);
         }
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index 7062a8a0..88ce6a83 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -1383,7 +1383,7 @@ void gk20a_fifo_abort_tsg(struct gk20a *g, u32 tsgid, bool preempt)
 
         gk20a_dbg_fn("");
 
-        gk20a_disable_tsg(tsg);
+        g->ops.fifo.disable_tsg(tsg);
 
         if (preempt)
                 g->ops.fifo.preempt_tsg(g, tsgid);
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index d2a752d7..4564b6e9 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -475,6 +475,8 @@ struct gpu_ops {
                 int (*resetup_ramfc)(struct channel_gk20a *c);
                 int (*preempt_channel)(struct gk20a *g, u32 chid);
                 int (*preempt_tsg)(struct gk20a *g, u32 tsgid);
+                int (*enable_tsg)(struct tsg_gk20a *tsg);
+                int (*disable_tsg)(struct tsg_gk20a *tsg);
                 int (*reschedule_runlist)(struct gk20a *g, u32 runlist_id);
                 int (*update_runlist)(struct gk20a *g, u32 runlist_id,
                                 u32 chid, bool add,
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index b77f10d2..46c1e81f 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -28,6 +28,7 @@
 #include "gk20a/regops_gk20a.h"
 #include "gk20a/pmu_gk20a.h"
 #include "gk20a/gr_gk20a.h"
+#include "gk20a/tsg_gk20a.h"
 
 #include "ltc_gm20b.h"
 #include "gr_gm20b.h"
@@ -365,6 +366,8 @@ static const struct gpu_ops gm20b_ops = {
                 .pbdma_acquire_val = gk20a_fifo_pbdma_acquire_val,
                 .preempt_channel = gk20a_fifo_preempt_channel,
                 .preempt_tsg = gk20a_fifo_preempt_tsg,
+                .enable_tsg = gk20a_enable_tsg,
+                .disable_tsg = gk20a_disable_tsg,
                 .update_runlist = gk20a_fifo_update_runlist,
                 .trigger_mmu_fault = gm20b_fifo_trigger_mmu_fault,
                 .get_mmu_fault_info = gk20a_fifo_get_mmu_fault_info,
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index b33e80ec..e3fa596a 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -426,6 +426,8 @@ static const struct gpu_ops gp106_ops = {
                 .pbdma_acquire_val = gk20a_fifo_pbdma_acquire_val,
                 .preempt_channel = gk20a_fifo_preempt_channel,
                 .preempt_tsg = gk20a_fifo_preempt_tsg,
+                .enable_tsg = gk20a_enable_tsg,
+                .disable_tsg = gk20a_disable_tsg,
                 .update_runlist = gk20a_fifo_update_runlist,
                 .trigger_mmu_fault = gm20b_fifo_trigger_mmu_fault,
                 .get_mmu_fault_info = gp10b_fifo_get_mmu_fault_info,
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
index 3efee9e2..ffb6fe24 100644
--- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
@@ -28,6 +28,7 @@
 #include "gk20a/fb_gk20a.h"
 #include "gk20a/pmu_gk20a.h"
 #include "gk20a/gr_gk20a.h"
+#include "gk20a/tsg_gk20a.h"
 
 #include "gp10b/gr_gp10b.h"
 #include "gp10b/fecs_trace_gp10b.h"
@@ -386,6 +387,8 @@ static const struct gpu_ops gp10b_ops = {
                 .pbdma_acquire_val = gk20a_fifo_pbdma_acquire_val,
                 .preempt_channel = gk20a_fifo_preempt_channel,
                 .preempt_tsg = gk20a_fifo_preempt_tsg,
+                .enable_tsg = gk20a_enable_tsg,
+                .disable_tsg = gk20a_disable_tsg,
                 .reschedule_runlist = gk20a_fifo_reschedule_runlist,
                 .update_runlist = gk20a_fifo_update_runlist,
                 .trigger_mmu_fault = gm20b_fifo_trigger_mmu_fault,
diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
index 252b4e43..26e4de02 100644
--- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
@@ -821,6 +821,8 @@ void vgpu_init_fifo_ops(struct gpu_ops *gops)
         gops->fifo.setup_ramfc = vgpu_channel_setup_ramfc;
         gops->fifo.preempt_channel = vgpu_fifo_preempt_channel;
         gops->fifo.preempt_tsg = vgpu_fifo_preempt_tsg;
+        gops->fifo.enable_tsg = gk20a_enable_tsg;
+        gops->fifo.disable_tsg = gk20a_disable_tsg;
         gops->fifo.update_runlist = vgpu_fifo_update_runlist;
         gops->fifo.wait_engine_idle = vgpu_fifo_wait_engine_idle;
         gops->fifo.channel_set_priority = vgpu_channel_set_priority;