gpu: nvgpu: Make alloc_obj_ctx args Linux specific

Use nvgpu_alloc_obj_ctx_args structure specific to Linux code only.
Pass the fields of the structure as separate arguments to all common
functions.

gr_ops_gp10b.h referred to the struct, but it's not used anywhere,
so delete the file.

JIRA NVGPU-259

Change-Id: Idba78d48de1c30f205a42da2fe47a9f8c03735f1
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1586563
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

2 files changed, 7 insertions, 7 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/cde.c b/drivers/gpu/nvgpu/common/linux/cde.c
index 30edc1d5..65c50726 100644
--- a/drivers/gpu/nvgpu/common/linux/cde.c
+++ b/drivers/gpu/nvgpu/common/linux/cde.c
@@ -527,16 +527,12 @@ static int gk20a_init_cde_required_class(struct gk20a_cde_ctx *cde_ctx,
 {
         struct nvgpu_os_linux *l = cde_ctx->l;
         struct gk20a *g = &l->g;
-        struct nvgpu_alloc_obj_ctx_args alloc_obj_ctx;
         int err;
 
-        alloc_obj_ctx.class_num = required_class;
-        alloc_obj_ctx.flags = 0;
-
         /* CDE enabled */
         cde_ctx->ch->cde = true;
 
-        err = gk20a_alloc_obj_ctx(cde_ctx->ch, &alloc_obj_ctx);
+        err = gk20a_alloc_obj_ctx(cde_ctx->ch, required_class, 0);
         if (err) {
                 nvgpu_warn(g, "cde: failed to allocate ctx. err=%d",
                            err);
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
index ee4755c8..7814aea5 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
@@ -923,6 +923,10 @@ long gk20a_channel_ioctl(struct file *filp,
         case NVGPU_IOCTL_CHANNEL_SET_NVMAP_FD:
                 break;
         case NVGPU_IOCTL_CHANNEL_ALLOC_OBJ_CTX:
+        {
+                struct nvgpu_alloc_obj_ctx_args *args =
+                                (struct nvgpu_alloc_obj_ctx_args *)buf;
+
                 err = gk20a_busy(ch->g);
                 if (err) {
                         dev_err(dev,
@@ -930,10 +934,10 @@ long gk20a_channel_ioctl(struct file *filp,
                                 __func__, cmd);
                         break;
                 }
-                err = ch->g->ops.gr.alloc_obj_ctx(ch,
-                                (struct nvgpu_alloc_obj_ctx_args *)buf);
+                err = ch->g->ops.gr.alloc_obj_ctx(ch, args->class_num, args->flags);
                 gk20a_idle(ch->g);
                 break;
+        }
         case NVGPU_IOCTL_CHANNEL_ALLOC_GPFIFO_EX:
         {
                 struct nvgpu_alloc_gpfifo_ex_args *alloc_gpfifo_ex_args =