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>

1 files changed, 6 insertions, 0 deletions

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;