diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2017-10-31 07:07:08 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-11-07 20:10:57 -0500 |
commit | 760f8dd7fbbfaee7607d10c38fe013f9cb069cd7 (patch) | |
tree | 34239151105624cefd782798785fd442c67833fa /drivers/gpu/nvgpu/common | |
parent | 295ade2f1ea76f2cf61ab93465d251cabb681f49 (diff) |
gpu: nvgpu: drop user callback support in CE
Simplify the copyengine code by deleting support for the
ce_event_callback feature that has never been used. Similarly, create a
channel without the finish callback to get rid of that Linux dependency,
and delete the finish callback function as it now serves no purpose.
Delete also the submitted_seq_number and completed_seq_number fields
that are only written to.
Jira NVGPU-259
Change-Id: I02d15bdcb546f4dd8895a6bfb5130caf88a104e2
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1589320
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ce2.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/mm.c | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/ce2.c b/drivers/gpu/nvgpu/common/linux/ce2.c index 3fee23e5..5127a32b 100644 --- a/drivers/gpu/nvgpu/common/linux/ce2.c +++ b/drivers/gpu/nvgpu/common/linux/ce2.c | |||
@@ -173,7 +173,6 @@ int gk20a_ce_execute_ops(struct gk20a *g, | |||
173 | 173 | ||
174 | /* Next available command buffer queue Index */ | 174 | /* Next available command buffer queue Index */ |
175 | ++ce_ctx->cmd_buf_read_queue_offset; | 175 | ++ce_ctx->cmd_buf_read_queue_offset; |
176 | ++ce_ctx->submitted_seq_number; | ||
177 | } | 176 | } |
178 | } else { | 177 | } else { |
179 | ret = -ENOMEM; | 178 | ret = -ENOMEM; |
diff --git a/drivers/gpu/nvgpu/common/mm/mm.c b/drivers/gpu/nvgpu/common/mm/mm.c index cb7c443d..73af31c9 100644 --- a/drivers/gpu/nvgpu/common/mm/mm.c +++ b/drivers/gpu/nvgpu/common/mm/mm.c | |||
@@ -259,12 +259,11 @@ void nvgpu_init_mm_ce_context(struct gk20a *g) | |||
259 | #if defined(CONFIG_GK20A_VIDMEM) | 259 | #if defined(CONFIG_GK20A_VIDMEM) |
260 | if (g->mm.vidmem.size && (g->mm.vidmem.ce_ctx_id == (u32)~0)) { | 260 | if (g->mm.vidmem.size && (g->mm.vidmem.ce_ctx_id == (u32)~0)) { |
261 | g->mm.vidmem.ce_ctx_id = | 261 | g->mm.vidmem.ce_ctx_id = |
262 | gk20a_ce_create_context_with_cb(g, | 262 | gk20a_ce_create_context(g, |
263 | gk20a_fifo_get_fast_ce_runlist_id(g), | 263 | gk20a_fifo_get_fast_ce_runlist_id(g), |
264 | -1, | 264 | -1, |
265 | -1, | 265 | -1, |
266 | -1, | 266 | -1); |
267 | NULL); | ||
268 | 267 | ||
269 | if (g->mm.vidmem.ce_ctx_id == (u32)~0) | 268 | if (g->mm.vidmem.ce_ctx_id == (u32)~0) |
270 | nvgpu_err(g, | 269 | nvgpu_err(g, |