4 files changed, 17 insertions, 13 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c b/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c
index 98fdb8c2..92f88333 100644
--- a/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c
@@ -139,7 +139,8 @@ static bool gk20a_is_falcon_scrubbing_done(struct nvgpu_falcon *flcn)
         return status;
 }
 
-static u32 gk20a_falcon_get_mem_size(struct nvgpu_falcon *flcn, u32 mem_type)
+static u32 gk20a_falcon_get_mem_size(struct nvgpu_falcon *flcn,
+                enum flcn_mem_type mem_type)
 {
         struct gk20a *g = flcn->g;
         u32 mem_size = 0;
@@ -157,7 +158,7 @@ static u32 gk20a_falcon_get_mem_size(struct nvgpu_falcon *flcn, u32 mem_type)
 }
 
 static int flcn_mem_overflow_check(struct nvgpu_falcon *flcn,
-                u32 offset, u32 size, u32 mem_type)
+                u32 offset, u32 size, enum flcn_mem_type mem_type)
 {
         struct gk20a *g = flcn->g;
         u32 mem_size = 0;
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index c29c03f0..204fd371 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -250,7 +250,7 @@ struct gpu_ops {
                 int (*get_zcull_info)(struct gk20a *g, struct gr_gk20a *gr,
                                 struct gr_zcull_info *zcull_params);
                 int (*decode_egpc_addr)(struct gk20a *g,
-                        u32 addr, int *addr_type,
+                        u32 addr, enum ctxsw_addr_type *addr_type,
                         u32 *gpc_num, u32 *tpc_num, u32 *broadcast_flags);
                 void (*egpc_etpc_priv_addr_table)(struct gk20a *g, u32 addr,
                         u32 gpc, u32 tpc, u32 broadcast_flags,
@@ -473,7 +473,7 @@ struct gpu_ops {
                                         u32 *count, u32 *offset,
                                         u32 max_cnt, u32 base, u32 mask);
                 int (*decode_priv_addr)(struct gk20a *g, u32 addr,
-                              int *addr_type,
+                              enum ctxsw_addr_type *addr_type,
                               u32 *gpc_num, u32 *tpc_num,
                               u32 *ppc_num, u32 *be_num,
                               u32 *broadcast_flags);
@@ -495,8 +495,9 @@ struct gpu_ops {
                         struct channel_gk20a *c, bool patch);
                 u32 (*get_nonpes_aware_tpc)(struct gk20a *g, u32 gpc, u32 tpc);
                 int (*get_offset_in_gpccs_segment)(struct gk20a *g,
-                        int addr_type, u32 num_tpcs, u32 num_ppcs,
-                        u32 reg_list_ppc_count, u32 *__offset_in_segment);
+                        enum ctxsw_addr_type addr_type, u32 num_tpcs,
+                        u32 num_ppcs, u32 reg_list_ppc_count,
+                        u32 *__offset_in_segment);
         } gr;
         struct {
                 void (*init_hw)(struct gk20a *g);
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index bedd39eb..5539b801 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -6274,7 +6274,7 @@ static int gr_gk20a_find_priv_offset_in_pm_buffer(struct gk20a *g,
 
 /* This function will decode a priv address and return the partition type and numbers. */
 int gr_gk20a_decode_priv_addr(struct gk20a *g, u32 addr,
-                              int  *addr_type, /* enum ctxsw_addr_type */
+                              enum ctxsw_addr_type *addr_type,
                               u32 *gpc_num, u32 *tpc_num, u32 *ppc_num, u32 *be_num,
                               u32 *broadcast_flags)
 {
@@ -6391,7 +6391,7 @@ int gr_gk20a_create_priv_addr_table(struct gk20a *g,
                                            u32 *priv_addr_table,
                                            u32 *num_registers)
 {
-        int addr_type; /*enum ctxsw_addr_type */
+        enum ctxsw_addr_type addr_type;
         u32 gpc_num, tpc_num, ppc_num, be_num;
         u32 priv_addr, gpc_addr;
         u32 broadcast_flags;
@@ -7036,7 +7036,7 @@ static int gr_gk20a_find_priv_offset_in_ext_buffer(struct gk20a *g,
 
 static int
 gr_gk20a_process_context_buffer_priv_segment(struct gk20a *g,
-                                             int addr_type,/* enum ctxsw_addr_type */
+                                             enum ctxsw_addr_type addr_type,
                                              u32 pri_addr,
                                              u32 gpc_num, u32 num_tpcs,
                                              u32 num_ppcs, u32 ppc_mask,
@@ -7214,7 +7214,7 @@ static int gr_gk20a_determine_ppc_configuration(struct gk20a *g,
 }
 
 int gr_gk20a_get_offset_in_gpccs_segment(struct gk20a *g,
-                                        int addr_type,
+                                        enum ctxsw_addr_type addr_type,
                                         u32 num_tpcs,
                                         u32 num_ppcs,
                                         u32 reg_list_ppc_count,
@@ -7289,7 +7289,7 @@ static int gr_gk20a_find_priv_offset_in_buffer(struct gk20a *g,
 {
         u32 i, data32;
         int err;
-        int addr_type; /*enum ctxsw_addr_type */
+        enum ctxsw_addr_type addr_type;
         u32 broadcast_flags;
         u32 gpc_num, tpc_num, ppc_num, be_num;
         u32 num_gpcs, num_tpcs, num_ppcs;
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index 804e0e25..2b31b6b6 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -70,6 +70,8 @@ struct tsg_gk20a;
 struct channel_gk20a;
 struct nvgpu_warpstate;
 
+enum ctxsw_addr_type;
+
 enum /* global_ctx_buffer */ {
         CIRCULAR                = 0,
         PAGEPOOL                = 1,
@@ -842,7 +844,7 @@ int gr_gk20a_add_ctxsw_reg_perf_pma(struct ctxsw_buf_offset_map_entry *map,
         u32 *count, u32 *offset,
         u32 max_cnt, u32 base, u32 mask);
 int gr_gk20a_decode_priv_addr(struct gk20a *g, u32 addr,
-        int *addr_type,
+        enum ctxsw_addr_type *addr_type,
         u32 *gpc_num, u32 *tpc_num, u32 *ppc_num, u32 *be_num,
         u32 *broadcast_flags);
 int gr_gk20a_split_ppc_broadcast_addr(struct gk20a *g, u32 addr,
@@ -856,7 +858,7 @@ void gr_gk20a_split_fbpa_broadcast_addr(struct gk20a *g, u32 addr,
         u32 num_fbpas,
         u32 *priv_addr_table, u32 *t);
 int gr_gk20a_get_offset_in_gpccs_segment(struct gk20a *g,
-        int addr_type, u32 num_tpcs, u32 num_ppcs,
+        enum ctxsw_addr_type addr_type, u32 num_tpcs, u32 num_ppcs,
         u32 reg_list_ppc_count, u32 *__offset_in_segment);
 
 void gk20a_gr_destroy_ctx_buffer(struct gk20a *g,