gpu: nvgpu: Disallow use of bare channels

All channels need to now be wrapped in TSGs. Disallow use of bare
channels by preventing creation of GPFIFO for them.

Bug 1842197

Change-Id: Id0ebee4c590804b96c09f8951e35ba2680b596e7
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1612697
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

4 files changed, 11 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/cde.c b/drivers/gpu/nvgpu/common/linux/cde.c
index b48c498d..f6b43113 100644
--- a/drivers/gpu/nvgpu/common/linux/cde.c
+++ b/drivers/gpu/nvgpu/common/linux/cde.c
@@ -1294,7 +1294,8 @@ static int gk20a_cde_load(struct gk20a_cde_ctx *cde_ctx)
         }
 
         /* allocate gpfifo (1024 should be more than enough) */
-        err = gk20a_channel_alloc_gpfifo(ch, 1024, 0, 0);
+        err = gk20a_channel_alloc_gpfifo(ch, 1024, 0,
+                        NVGPU_GPFIFO_FLAGS_ALLOW_BARE_CHANNEL);
         if (err) {
                 nvgpu_warn(g, "cde: unable to allocate gpfifo");
                 goto err_alloc_gpfifo;
diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
index 99c518b5..67264f40 100644
--- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
@@ -490,7 +490,8 @@ u32 gk20a_ce_create_context(struct gk20a *g,
         }
 
         /* allocate gpfifo (1024 should be more than enough) */
-        err = gk20a_channel_alloc_gpfifo(ce_ctx->ch, 1024, 0, 0);
+        err = gk20a_channel_alloc_gpfifo(ce_ctx->ch, 1024, 0,
+                        NVGPU_GPFIFO_FLAGS_ALLOW_BARE_CHANNEL);
         if (err) {
                 nvgpu_err(g, "ce: unable to allocate gpfifo");
                 goto end;
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index e10be3c9..ee78d0b1 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -1134,6 +1134,12 @@ int gk20a_channel_alloc_gpfifo(struct channel_gk20a *c,
         gpfifo_size = num_entries;
         gpfifo_entry_size = nvgpu_get_gpfifo_entry_size();
 
+        if (!(flags & NVGPU_GPFIFO_FLAGS_ALLOW_BARE_CHANNEL) &&
+            !gk20a_is_channel_marked_as_tsg(c)) {
+                nvgpu_err(g, "channel not part of a TSG");
+                return -EINVAL;
+        }
+
         if (flags & NVGPU_GPFIFO_FLAGS_SUPPORT_VPR)
                 c->vpr = true;
 
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
index e6f73cf6..21ebeb9f 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
@@ -49,6 +49,7 @@ struct fifo_profile_gk20a;
 #define NVGPU_GPFIFO_FLAGS_SUPPORT_VPR                  (1 << 0)
 #define NVGPU_GPFIFO_FLAGS_SUPPORT_DETERMINISTIC        (1 << 1)
 #define NVGPU_GPFIFO_FLAGS_REPLAYABLE_FAULTS_ENABLE     (1 << 2)
+#define NVGPU_GPFIFO_FLAGS_ALLOW_BARE_CHANNEL           (1 << 3)
 
 /* Flags to be passed to g->ops.gr.alloc_obj_ctx() */
 #define NVGPU_OBJ_CTX_FLAGS_SUPPORT_GFXP                (1 << 1)