gpu: nvgpu: cde: remove unused obj_ids

obj_id from gk20a_alloc_obj_ctx is not used and calling free_obj_ctx is
effectively a no-op, since the corresponding channel is also freed.

Bug 200059216

Change-Id: Icbe2cf5dc21d50cb007bf73829705451ada106ac
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/655368
Reviewed-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

2 files changed, 0 insertions, 18 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)
                                                           mem->iova);
         }
 
-        for (i = 0; i < cde_ctx->num_obj_ids; i++)
-                gk20a_free_obj_ctx(cde_ctx->ch,
-                        &(struct nvgpu_free_obj_ctx_args)
-                        { cde_ctx->obj_ids[i] });
-
         kfree(cde_ctx->init_convert_cmd);
 
         cde_ctx->convert_cmd = NULL;
         cde_ctx->init_convert_cmd = NULL;
         cde_ctx->num_bufs = 0;
-        cde_ctx->num_obj_ids = 0;
         cde_ctx->num_params = 0;
         cde_ctx->init_cmd_num_entries = 0;
         cde_ctx->convert_cmd_num_entries = 0;
@@ -520,11 +514,6 @@ static int gk20a_init_cde_required_class(struct gk20a_cde_ctx *cde_ctx,
         struct nvgpu_alloc_obj_ctx_args alloc_obj_ctx;
         int err;
 
-        if (cde_ctx->num_obj_ids >= MAX_CDE_OBJ_IDS) {
-                gk20a_warn(&cde_ctx->pdev->dev, "cde: running out of class ids");
-                return -ENOMEM;
-        }
-
         alloc_obj_ctx.class_num = required_class;
         alloc_obj_ctx.padding = 0;
 
@@ -535,9 +524,6 @@ static int gk20a_init_cde_required_class(struct gk20a_cde_ctx *cde_ctx,
                 return err;
         }
 
-        cde_ctx->obj_ids[cde_ctx->num_obj_ids] = alloc_obj_ctx.obj_id;
-        cde_ctx->num_obj_ids++;
-
         return 0;
 }
 
diff --git a/drivers/gpu/nvgpu/gk20a/cde_gk20a.h b/drivers/gpu/nvgpu/gk20a/cde_gk20a.h
index 029bc149..de51ba33 100644
--- a/drivers/gpu/nvgpu/gk20a/cde_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/cde_gk20a.h
@@ -24,7 +24,6 @@
 #define MAX_CDE_BUFS            10
 #define MAX_CDE_PARAMS          64
 #define MAX_CDE_USER_PARAMS     40
-#define MAX_CDE_OBJ_IDS         4
 #define MAX_CDE_ARRAY_ENTRIES   9
 
 /*
@@ -245,9 +244,6 @@ struct gk20a_cde_ctx {
         u64 compbit_vaddr;
         u64 compbit_size;
 
-        u32 obj_ids[MAX_CDE_OBJ_IDS];
-        int num_obj_ids;
-
         u64 backing_store_vaddr;
 
         struct nvgpu_gpfifo *init_convert_cmd;