diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/cde_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/cde_gk20a.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c index 8bdfbd05..d2384257 100644 --- a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c | |||
@@ -57,17 +57,11 @@ static void gk20a_deinit_cde_img(struct gk20a_cde_ctx *cde_ctx) | |||
57 | mem->iova); | 57 | mem->iova); |
58 | } | 58 | } |
59 | 59 | ||
60 | for (i = 0; i < cde_ctx->num_obj_ids; i++) | ||
61 | gk20a_free_obj_ctx(cde_ctx->ch, | ||
62 | &(struct nvgpu_free_obj_ctx_args) | ||
63 | { cde_ctx->obj_ids[i] }); | ||
64 | |||
65 | kfree(cde_ctx->init_convert_cmd); | 60 | kfree(cde_ctx->init_convert_cmd); |
66 | 61 | ||
67 | cde_ctx->convert_cmd = NULL; | 62 | cde_ctx->convert_cmd = NULL; |
68 | cde_ctx->init_convert_cmd = NULL; | 63 | cde_ctx->init_convert_cmd = NULL; |
69 | cde_ctx->num_bufs = 0; | 64 | cde_ctx->num_bufs = 0; |
70 | cde_ctx->num_obj_ids = 0; | ||
71 | cde_ctx->num_params = 0; | 65 | cde_ctx->num_params = 0; |
72 | cde_ctx->init_cmd_num_entries = 0; | 66 | cde_ctx->init_cmd_num_entries = 0; |
73 | cde_ctx->convert_cmd_num_entries = 0; | 67 | cde_ctx->convert_cmd_num_entries = 0; |
@@ -520,11 +514,6 @@ static int gk20a_init_cde_required_class(struct gk20a_cde_ctx *cde_ctx, | |||
520 | struct nvgpu_alloc_obj_ctx_args alloc_obj_ctx; | 514 | struct nvgpu_alloc_obj_ctx_args alloc_obj_ctx; |
521 | int err; | 515 | int err; |
522 | 516 | ||
523 | if (cde_ctx->num_obj_ids >= MAX_CDE_OBJ_IDS) { | ||
524 | gk20a_warn(&cde_ctx->pdev->dev, "cde: running out of class ids"); | ||
525 | return -ENOMEM; | ||
526 | } | ||
527 | |||
528 | alloc_obj_ctx.class_num = required_class; | 517 | alloc_obj_ctx.class_num = required_class; |
529 | alloc_obj_ctx.padding = 0; | 518 | alloc_obj_ctx.padding = 0; |
530 | 519 | ||
@@ -535,9 +524,6 @@ static int gk20a_init_cde_required_class(struct gk20a_cde_ctx *cde_ctx, | |||
535 | return err; | 524 | return err; |
536 | } | 525 | } |
537 | 526 | ||
538 | cde_ctx->obj_ids[cde_ctx->num_obj_ids] = alloc_obj_ctx.obj_id; | ||
539 | cde_ctx->num_obj_ids++; | ||
540 | |||
541 | return 0; | 527 | return 0; |
542 | } | 528 | } |
543 | 529 | ||