summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
diff options
context:
space:
mode:
authorScott Long <scottl@nvidia.com>2018-08-08 21:30:09 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-08-22 20:31:42 -0400
commit07f6739285140d7c5335ddcb8996450966bfc175 (patch)
treec7f1b3a73d519e44e4fe0d29516e6516740edb26 /drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
parent1c13da1d29c344cb60953eabeca56b601446c64a (diff)
gpu: nvgpu: switch gk20a nonstall ops to #defines
Fix MISRA rule 10.1 violations involving gk20a_nonstall_ops enums by replacing them with with corresponding #defines. Because these values can be used in expressions that require unsigned values (e.g. bitwise OR) we cannot use enums. The g->ce2.isr_nonstall() function was previously returning an int that was a combination of gk20a_nonstall_ops enum bits which led to the violations. JIRA NVGPU-650 Change-Id: I6210aacec8829b3c8d339c5fe3db2f3069c67406 Signed-off-by: Scott Long <scottl@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1796242 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/fifo_gk20a.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index 4628de4f..20fb51e7 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)
2720 return; 2720 return;
2721} 2721}
2722 2722
2723enum gk20a_nonstall_ops gk20a_fifo_nonstall_isr(struct gk20a *g) 2723u32 gk20a_fifo_nonstall_isr(struct gk20a *g)
2724{ 2724{
2725 u32 fifo_intr = gk20a_readl(g, fifo_intr_0_r()); 2725 u32 fifo_intr = gk20a_readl(g, fifo_intr_0_r());
2726 u32 clear_intr = 0; 2726 u32 clear_intr = 0;
@@ -2732,7 +2732,7 @@ enum gk20a_nonstall_ops gk20a_fifo_nonstall_isr(struct gk20a *g)
2732 2732
2733 gk20a_writel(g, fifo_intr_0_r(), clear_intr); 2733 gk20a_writel(g, fifo_intr_0_r(), clear_intr);
2734 2734
2735 return gk20a_nonstall_ops_wakeup_semaphore; 2735 return GK20A_NONSTALL_OPS_WAKEUP_SEMAPHORE;
2736} 2736}
2737 2737
2738void gk20a_fifo_issue_preempt(struct gk20a *g, u32 id, bool is_tsg) 2738void gk20a_fifo_issue_preempt(struct gk20a *g, u32 id, bool is_tsg)