gpu: nvgpu: vgpu: move to use vgpu_get_handle helper function

JIRA VFND-2103

Change-Id: Ic11cff40e64849cb6abb193bec54d03857433416
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: http://git-master/r/1185205
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vladislav Buzov <vbuzov@nvidia.com>

2 files changed, 5 insertions, 9 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c
index 3194fff1..78205afb 100644
--- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c
+++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c
@@ -20,7 +20,6 @@
 static void vgpu_gr_gp10b_free_gr_ctx(struct gk20a *g, struct vm_gk20a *vm,
                                 struct gr_ctx_desc *gr_ctx)
 {
-        struct gk20a_platform *platform = gk20a_get_platform(g->dev);
         struct tegra_vgpu_cmd_msg msg = {0};
         struct tegra_vgpu_gr_ctx_params *p = &msg.params.gr_ctx;
         int err;
@@ -31,7 +30,7 @@ static void vgpu_gr_gp10b_free_gr_ctx(struct gk20a *g, struct vm_gk20a *vm,
                 return;
 
         msg.cmd = TEGRA_VGPU_CMD_GR_CTX_FREE;
-        msg.handle = platform->virt_handle;
+        msg.handle = vgpu_get_handle(g);
         p->gr_ctx_handle = gr_ctx->virt_ctx;
         err = vgpu_comm_sendrecv(&msg, sizeof(msg), sizeof(msg));
         WARN_ON(err || msg.ret);
@@ -52,7 +51,6 @@ static int vgpu_gr_gp10b_alloc_gr_ctx(struct gk20a *g,
                                 u32 class,
                                 u32 flags)
 {
-        struct gk20a_platform *platform = gk20a_get_platform(g->dev);
         struct tegra_vgpu_cmd_msg msg = {0};
         struct tegra_vgpu_gr_bind_ctxsw_buffers_params *p =
                         &msg.params.gr_bind_ctxsw_buffers;
@@ -162,7 +160,7 @@ static int vgpu_gr_gp10b_alloc_gr_ctx(struct gk20a *g,
 
         if (gr_ctx->graphics_preempt_mode || gr_ctx->compute_preempt_mode) {
                 msg.cmd = TEGRA_VGPU_CMD_CHANNEL_BIND_GR_CTXSW_BUFFERS;
-                msg.handle = platform->virt_handle;
+                msg.handle = vgpu_get_handle(g);
                 p->gr_ctx_handle = gr_ctx->virt_ctx;
                 err = vgpu_comm_sendrecv(&msg, sizeof(msg), sizeof(msg));
                 if (err || msg.ret) {
@@ -181,7 +179,6 @@ fail:
 
 static int vgpu_gr_gp10b_init_ctx_state(struct gk20a *g)
 {
-        struct gk20a_platform *platform = gk20a_get_platform(g->dev);
         int err;
 
         gk20a_dbg_fn("");
@@ -190,7 +187,7 @@ static int vgpu_gr_gp10b_init_ctx_state(struct gk20a *g)
         if (err)
                 return err;
 
-        vgpu_get_attribute(platform->virt_handle,
+        vgpu_get_attribute(vgpu_get_handle(g),
                         TEGRA_VGPU_ATTRIB_PREEMPT_CTX_SIZE,
                         &g->gr.t18x.ctx_vars.preempt_image_size);
         if (!g->gr.t18x.ctx_vars.preempt_image_size)
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_mm_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_mm_gp10b.c
index 1b6003b3..8be6b19c 100644
--- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_mm_gp10b.c
+++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_mm_gp10b.c
@@ -1,7 +1,7 @@
 /*
  * Virtualized GPU Memory Management
  *
- * Copyright (c) 2015, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2015-2016, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -57,7 +57,6 @@ static u64 vgpu_gp10b_locked_gmmu_map(struct vm_gk20a *vm,
         int err = 0;
         struct device *d = dev_from_vm(vm);
         struct gk20a *g = gk20a_from_vm(vm);
-        struct gk20a_platform *platform = gk20a_get_platform(g->dev);
         struct tegra_vgpu_cmd_msg msg;
         struct tegra_vgpu_as_map_ex_params *p = &msg.params.as_map_ex;
         struct tegra_vgpu_mem_desc *mem_desc;
@@ -149,7 +148,7 @@ static u64 vgpu_gp10b_locked_gmmu_map(struct vm_gk20a *vm,
         }
 
         msg.cmd = TEGRA_VGPU_CMD_AS_MAP_EX;
-        msg.handle = platform->virt_handle;
+        msg.handle = vgpu_get_handle(g);
         p->handle = vm->handle;
         p->gpu_va = map_offset;
         p->size = size;