diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-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 |
3 files changed, 1 insertions, 9 deletions
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) |