From da43fc55606f40f27c0f823671bca16a979634cc Mon Sep 17 00:00:00 2001 From: Amulya Date: Fri, 17 Aug 2018 16:59:52 +0530 Subject: gpu: nvgpu: MISRA 10.3-Conversions to/from an enum Fix violations where the conversion is from a non-enum type to enum type or vice-versa. JIRA NVGPU-659 Change-Id: I45f43c907b810cc86b2a4480809d0c6757ed3486 Signed-off-by: Amulya Reviewed-on: https://git-master.nvidia.com/r/1802322 GVS: Gerrit_Virtual_Submit Tested-by: Amulya Murthyreddy Reviewed-by: Alex Waterman Reviewed-by: Adeel Raza Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 2 +- drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | 3 ++- drivers/gpu/nvgpu/gk20a/gk20a.h | 5 +++-- drivers/gpu/nvgpu/gk20a/mm_gk20a.h | 6 ++++-- 4 files changed, 10 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a') diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index fc6c9ad2..4628de4f 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c @@ -2720,7 +2720,7 @@ void gk20a_fifo_isr(struct gk20a *g) return; } -u32 gk20a_fifo_nonstall_isr(struct gk20a *g) +enum gk20a_nonstall_ops gk20a_fifo_nonstall_isr(struct gk20a *g) { u32 fifo_intr = gk20a_readl(g, fifo_intr_0_r()); u32 clear_intr = 0; diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h index 77030c94..120950c1 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h @@ -31,6 +31,7 @@ struct gk20a_debug_output; struct mmu_fault_info; +enum gk20a_nonstall_ops; enum { NVGPU_FIFO_RUNLIST_INTERLEAVE_LEVEL_LOW = 0, @@ -228,7 +229,7 @@ int gk20a_init_fifo_support(struct gk20a *g); int gk20a_init_fifo_setup_hw(struct gk20a *g); void gk20a_fifo_isr(struct gk20a *g); -u32 gk20a_fifo_nonstall_isr(struct gk20a *g); +enum gk20a_nonstall_ops gk20a_fifo_nonstall_isr(struct gk20a *g); int gk20a_fifo_preempt_channel(struct gk20a *g, u32 chid); int gk20a_fifo_preempt_tsg(struct gk20a *g, u32 tsgid); diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index febd7e0c..262dbb2c 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h @@ -139,6 +139,7 @@ enum gk20a_cbc_op { enum nvgpu_unit; enum nvgpu_flush_op; +enum gk20a_mem_rw_flag; struct _resmgr_context; struct nvgpu_gpfifo_entry; @@ -924,7 +925,7 @@ struct gpu_ops { u8 kind_v, u32 ctag_offset, u32 flags, - int rw_flag, + enum gk20a_mem_rw_flag rw_flag, bool clear_ctags, bool sparse, bool priv, @@ -935,7 +936,7 @@ struct gpu_ops { u64 size, int pgsz_idx, bool va_allocated, - int rw_flag, + enum gk20a_mem_rw_flag rw_flag, bool sparse, struct vm_gk20a_mapping_batch *batch); int (*vm_bind_channel)(struct vm_gk20a *vm, diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h index 7b7c2ef7..b99603bb 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h @@ -30,6 +30,8 @@ #include #include +enum gk20a_mem_rw_flag; + struct gpfifo_desc { struct nvgpu_mem mem; u32 entry_num; @@ -141,7 +143,7 @@ u64 gk20a_locked_gmmu_map(struct vm_gk20a *vm, u8 kind_v, u32 ctag_offset, u32 flags, - int rw_flag, + enum gk20a_mem_rw_flag rw_flag, bool clear_ctags, bool sparse, bool priv, @@ -153,7 +155,7 @@ void gk20a_locked_gmmu_unmap(struct vm_gk20a *vm, u64 size, int pgsz_idx, bool va_allocated, - int rw_flag, + enum gk20a_mem_rw_flag rw_flag, bool sparse, struct vm_gk20a_mapping_batch *batch); -- cgit v1.2.2