gpu: nvgpu: rename gpu ioctls and structs to nvgpu

To help remove the nvhost dependency from nvgpu, rename ioctl defines
and structures used by nvgpu such that nvhost is replaced by nvgpu.
Duplicate some structures as needed.

Update header guards and such accordingly.

Change-Id: Ifc3a867713072bae70256502735583ab38381877
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/542620
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/regops_gk20a.c b/drivers/gpu/nvgpu/gk20a/regops_gk20a.c
index 628b12ef..0e1081b9 100644
--- a/drivers/gpu/nvgpu/gk20a/regops_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/regops_gk20a.c
@@ -1,5 +1,4 @@
 /*
- *
  * Tegra GK20A GPU Debugger Driver Register Ops
  *
  * Copyright (c) 2013-2014, NVIDIA CORPORATION.  All rights reserved.
@@ -372,12 +371,12 @@ static const u32 gk20a_qctl_whitelist_ranges_count =
 
 static bool validate_reg_ops(struct dbg_session_gk20a *dbg_s,
                              u32 *ctx_rd_count, u32 *ctx_wr_count,
-                             struct nvhost_dbg_gpu_reg_op *ops,
+                             struct nvgpu_dbg_gpu_reg_op *ops,
                              u32 op_count);
 
 
 int exec_regops_gk20a(struct dbg_session_gk20a *dbg_s,
-                      struct nvhost_dbg_gpu_reg_op *ops,
+                      struct nvgpu_dbg_gpu_reg_op *ops,
                       u64 num_ops)
 {
         int err = 0, i;
@@ -502,7 +501,7 @@ int exec_regops_gk20a(struct dbg_session_gk20a *dbg_s,
 
 
 static int validate_reg_op_info(struct dbg_session_gk20a *dbg_s,
-                                struct nvhost_dbg_gpu_reg_op *op)
+                                struct nvgpu_dbg_gpu_reg_op *op)
 {
         int err = 0;
 
@@ -531,7 +530,7 @@ static int validate_reg_op_info(struct dbg_session_gk20a *dbg_s,
         case REGOP(TYPE_GR_CTX_QUAD):
                 break;
         /*
-        case NVHOST_DBG_GPU_REG_OP_TYPE_FB:
+        case NVGPU_DBG_GPU_REG_OP_TYPE_FB:
         */
         default:
                 op->status |= REGOP(STATUS_INVALID_TYPE);
@@ -544,7 +543,7 @@ static int validate_reg_op_info(struct dbg_session_gk20a *dbg_s,
 }
 
 static bool check_whitelists(struct dbg_session_gk20a *dbg_s,
-                          struct nvhost_dbg_gpu_reg_op *op, u32 offset)
+                          struct nvgpu_dbg_gpu_reg_op *op, u32 offset)
 {
         struct gk20a *g = dbg_s->g;
         bool valid = false;
@@ -606,7 +605,7 @@ static bool check_whitelists(struct dbg_session_gk20a *dbg_s,
 
 /* note: the op here has already been through validate_reg_op_info */
 static int validate_reg_op_offset(struct dbg_session_gk20a *dbg_s,
-                                  struct nvhost_dbg_gpu_reg_op *op)
+                                  struct nvgpu_dbg_gpu_reg_op *op)
 {
         int err;
         u32 buf_offset_lo, buf_offset_addr, num_offsets, offset;
@@ -656,7 +655,7 @@ static int validate_reg_op_offset(struct dbg_session_gk20a *dbg_s,
 
 static bool validate_reg_ops(struct dbg_session_gk20a *dbg_s,
                             u32 *ctx_rd_count, u32 *ctx_wr_count,
-                            struct nvhost_dbg_gpu_reg_op *ops,
+                            struct nvgpu_dbg_gpu_reg_op *ops,
                             u32 op_count)
 {
         u32 i;