gpu: nvgpu: gm20b: Enable CTA preemption

CTA preemption needs to be enabled by setting a value in context. Set
it for gm20b.

Bug 200063473
Bug 1517461

Change-Id: I080cd71b348d08f834fd23ebbe7443dba79224db
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/661299

4 files changed, 17 insertions, 7 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 9bb890ca..184ef168 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -151,7 +151,7 @@ struct gpu_ops {
                 int (*init_ctx_state)(struct gk20a *g);
                 int (*alloc_gr_ctx)(struct gk20a *g,
                           struct gr_ctx_desc **__gr_ctx, struct vm_gk20a *vm,
-                          u32 padding);
+                          u32 class, u32 padding);
                 void (*free_gr_ctx)(struct gk20a *g,
                           struct vm_gk20a *vm,
                           struct gr_ctx_desc *gr_ctx);
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 4f6c885c..37cccba3 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -67,7 +67,8 @@ static void gr_gk20a_unmap_global_ctx_buffers(struct channel_gk20a *c);
 
 /* channel gr ctx buffer */
 static int  gr_gk20a_alloc_channel_gr_ctx(struct gk20a *g,
-                                        struct channel_gk20a *c, u32 padding);
+                                        struct channel_gk20a *c,
+                                        u32 class, u32 padding);
 static void gr_gk20a_free_channel_gr_ctx(struct channel_gk20a *c);
 
 /* channel patch ctx buffer */
@@ -2486,6 +2487,7 @@ static void gr_gk20a_unmap_global_ctx_buffers(struct channel_gk20a *c)
 
 int gr_gk20a_alloc_gr_ctx(struct gk20a *g,
                           struct gr_ctx_desc **__gr_ctx, struct vm_gk20a *vm,
+                          u32 class,
                           u32 padding)
 {
         struct gr_ctx_desc *gr_ctx = NULL;
@@ -2551,7 +2553,7 @@ int gr_gk20a_alloc_gr_ctx(struct gk20a *g,
 }
 
 static int gr_gk20a_alloc_tsg_gr_ctx(struct gk20a *g,
-                        struct tsg_gk20a *tsg, u32 padding)
+                        struct tsg_gk20a *tsg, u32 class, u32 padding)
 {
         struct gr_ctx_desc **gr_ctx = &tsg->tsg_gr_ctx;
         int err;
@@ -2561,7 +2563,7 @@ static int gr_gk20a_alloc_tsg_gr_ctx(struct gk20a *g,
                 return -ENOMEM;
         }
 
-        err = g->ops.gr.alloc_gr_ctx(g, gr_ctx, tsg->vm, padding);
+        err = g->ops.gr.alloc_gr_ctx(g, gr_ctx, tsg->vm, class, padding);
         if (err)
                 return err;
 
@@ -2570,10 +2572,11 @@ static int gr_gk20a_alloc_tsg_gr_ctx(struct gk20a *g,
 
 static int gr_gk20a_alloc_channel_gr_ctx(struct gk20a *g,
                                 struct channel_gk20a *c,
+                                u32 class,
                                 u32 padding)
 {
         struct gr_ctx_desc **gr_ctx = &c->ch_ctx.gr_ctx;
-        int err = g->ops.gr.alloc_gr_ctx(g, gr_ctx, c->vm, padding);
+        int err = g->ops.gr.alloc_gr_ctx(g, gr_ctx, c->vm, class, padding);
         if (err)
                 return err;
 
@@ -2767,6 +2770,7 @@ int gk20a_alloc_obj_ctx(struct channel_gk20a  *c,
         if (!tsg) {
                 if (!ch_ctx->gr_ctx) {
                         err = gr_gk20a_alloc_channel_gr_ctx(g, c,
+                                                            args->class_num,
                                                             args->padding);
                         if (err) {
                                 gk20a_err(dev_from_gk20a(g),
@@ -2786,7 +2790,9 @@ int gk20a_alloc_obj_ctx(struct channel_gk20a  *c,
                 if (!tsg->tsg_gr_ctx) {
                         tsg->vm = c->vm;
                         gk20a_vm_get(tsg->vm);
-                        err = gr_gk20a_alloc_tsg_gr_ctx(g, tsg, args->padding);
+                        err = gr_gk20a_alloc_tsg_gr_ctx(g, tsg,
+                                                        args->class_num,
+                                                        args->padding);
                         if (err) {
                                 gk20a_err(dev_from_gk20a(g),
                                         "fail to allocate TSG gr ctx buffer");
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index 309faf3b..f130b830 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -496,7 +496,7 @@ int gr_gk20a_submit_fecs_method_op(struct gk20a *g,
                                    struct fecs_method_op_gk20a op);
 int gr_gk20a_alloc_gr_ctx(struct gk20a *g,
                           struct gr_ctx_desc **__gr_ctx, struct vm_gk20a *vm,
-                          u32 padding);
+                          u32 class, u32 padding);
 void gr_gk20a_free_gr_ctx(struct gk20a *g,
                           struct vm_gk20a *vm, struct gr_ctx_desc *gr_ctx);
 #endif /*__GR_GK20A_H__*/
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
index d3ee8670..04f9446b 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
@@ -150,11 +150,15 @@ struct gr_ctx_desc {
         u64 iova;
         size_t size;
         u64 gpu_va;
+        int preempt_mode;
 #ifdef CONFIG_ARCH_TEGRA_18x_SOC
         struct gr_ctx_desc_t18x t18x;
 #endif
 };
 
+#define NVGPU_GR_PREEMPTION_MODE_WFI            0
+#define NVGPU_GR_PREEMPTION_MODE_CTA            2
+
 struct compbit_store_desc {
         struct page **pages;
         struct sg_table *sgt;