diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-12-15 11:45:32 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-12-28 13:01:28 -0500 |
commit | aa52601f620423fdd98b79e2c2c5e1d767a5f685 (patch) | |
tree | baac16f9028de7023ea45813dbdf77e3721d9287 | |
parent | ea1b69d3f5e419ab1e66340779fda143e8f4ebc3 (diff) |
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 <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1618905
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/cde.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ce2_gk20a.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.h | 1 |
4 files changed, 2 insertions, 11 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/cde.c b/drivers/gpu/nvgpu/common/linux/cde.c index 1cb531fb..02ee27bc 100644 --- a/drivers/gpu/nvgpu/common/linux/cde.c +++ b/drivers/gpu/nvgpu/common/linux/cde.c | |||
@@ -1311,8 +1311,7 @@ static int gk20a_cde_load(struct gk20a_cde_ctx *cde_ctx) | |||
1311 | } | 1311 | } |
1312 | 1312 | ||
1313 | /* allocate gpfifo (1024 should be more than enough) */ | 1313 | /* allocate gpfifo (1024 should be more than enough) */ |
1314 | err = gk20a_channel_alloc_gpfifo(ch, 1024, 0, | 1314 | err = gk20a_channel_alloc_gpfifo(ch, 1024, 0, 0); |
1315 | NVGPU_GPFIFO_FLAGS_ALLOW_BARE_CHANNEL); | ||
1316 | if (err) { | 1315 | if (err) { |
1317 | nvgpu_warn(g, "cde: unable to allocate gpfifo"); | 1316 | nvgpu_warn(g, "cde: unable to allocate gpfifo"); |
1318 | goto err_alloc_gpfifo; | 1317 | goto err_alloc_gpfifo; |
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, | |||
490 | } | 490 | } |
491 | 491 | ||
492 | /* allocate gpfifo (1024 should be more than enough) */ | 492 | /* allocate gpfifo (1024 should be more than enough) */ |
493 | err = gk20a_channel_alloc_gpfifo(ce_ctx->ch, 1024, 0, | 493 | err = gk20a_channel_alloc_gpfifo(ce_ctx->ch, 1024, 0, 0); |
494 | NVGPU_GPFIFO_FLAGS_ALLOW_BARE_CHANNEL); | ||
495 | if (err) { | 494 | if (err) { |
496 | nvgpu_err(g, "ce: unable to allocate gpfifo"); | 495 | nvgpu_err(g, "ce: unable to allocate gpfifo"); |
497 | goto end; | 496 | 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, | |||
1134 | gpfifo_size = num_entries; | 1134 | gpfifo_size = num_entries; |
1135 | gpfifo_entry_size = nvgpu_get_gpfifo_entry_size(); | 1135 | gpfifo_entry_size = nvgpu_get_gpfifo_entry_size(); |
1136 | 1136 | ||
1137 | if (!(flags & NVGPU_GPFIFO_FLAGS_ALLOW_BARE_CHANNEL) && | ||
1138 | !gk20a_is_channel_marked_as_tsg(c)) { | ||
1139 | nvgpu_err(g, "channel not part of a TSG"); | ||
1140 | return -EINVAL; | ||
1141 | } | ||
1142 | |||
1143 | if (flags & NVGPU_GPFIFO_FLAGS_SUPPORT_VPR) | 1137 | if (flags & NVGPU_GPFIFO_FLAGS_SUPPORT_VPR) |
1144 | c->vpr = true; | 1138 | c->vpr = true; |
1145 | 1139 | ||
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; | |||
49 | #define NVGPU_GPFIFO_FLAGS_SUPPORT_VPR (1 << 0) | 49 | #define NVGPU_GPFIFO_FLAGS_SUPPORT_VPR (1 << 0) |
50 | #define NVGPU_GPFIFO_FLAGS_SUPPORT_DETERMINISTIC (1 << 1) | 50 | #define NVGPU_GPFIFO_FLAGS_SUPPORT_DETERMINISTIC (1 << 1) |
51 | #define NVGPU_GPFIFO_FLAGS_REPLAYABLE_FAULTS_ENABLE (1 << 2) | 51 | #define NVGPU_GPFIFO_FLAGS_REPLAYABLE_FAULTS_ENABLE (1 << 2) |
52 | #define NVGPU_GPFIFO_FLAGS_ALLOW_BARE_CHANNEL (1 << 3) | ||
53 | 52 | ||
54 | /* Flags to be passed to g->ops.gr.alloc_obj_ctx() */ | 53 | /* Flags to be passed to g->ops.gr.alloc_obj_ctx() */ |
55 | #define NVGPU_OBJ_CTX_FLAGS_SUPPORT_GFXP (1 << 1) | 54 | #define NVGPU_OBJ_CTX_FLAGS_SUPPORT_GFXP (1 << 1) |