From aa52601f620423fdd98b79e2c2c5e1d767a5f685 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 15 Dec 2017 08:45:32 -0800 Subject: gpu: nvgpu: Remove support for bare channels Remove remaining support for bare channels. All users of bare channels have already moved to TSGs. Bug 1842197 Change-Id: I1ff12677253b160dac9bebe6925ad0839ea07cfc Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1618905 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Deepak Nibade Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/ce2_gk20a.c | 3 +-- drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 6 ------ drivers/gpu/nvgpu/gk20a/channel_gk20a.h | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a') diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c index 67264f40..99c518b5 100644 --- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c @@ -490,8 +490,7 @@ 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, - NVGPU_GPFIFO_FLAGS_ALLOW_BARE_CHANNEL); + err = gk20a_channel_alloc_gpfifo(ce_ctx->ch, 1024, 0, 0); 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 ee78d0b1..e10be3c9 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c @@ -1134,12 +1134,6 @@ 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 21ebeb9f..e6f73cf6 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h @@ -49,7 +49,6 @@ 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) -- cgit v1.2.2