diff options
author | Scott Long <scottl@nvidia.com> | 2018-08-08 21:30:09 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-08-22 20:31:42 -0400 |
commit | 07f6739285140d7c5335ddcb8996450966bfc175 (patch) | |
tree | c7f1b3a73d519e44e4fe0d29516e6516740edb26 /drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |
parent | 1c13da1d29c344cb60953eabeca56b601446c64a (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/gr_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 90643971..f2b083d7 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -6101,8 +6101,8 @@ u32 gk20a_gr_nonstall_isr(struct gk20a *g) | |||
6101 | /* Clear the interrupt */ | 6101 | /* Clear the interrupt */ |
6102 | gk20a_writel(g, gr_intr_nonstall_r(), | 6102 | gk20a_writel(g, gr_intr_nonstall_r(), |
6103 | gr_intr_nonstall_trap_pending_f()); | 6103 | gr_intr_nonstall_trap_pending_f()); |
6104 | ops |= (u32)(gk20a_nonstall_ops_wakeup_semaphore | | 6104 | ops |= (GK20A_NONSTALL_OPS_WAKEUP_SEMAPHORE | |
6105 | gk20a_nonstall_ops_post_events); | 6105 | GK20A_NONSTALL_OPS_POST_EVENTS); |
6106 | } | 6106 | } |
6107 | return ops; | 6107 | return ops; |
6108 | } | 6108 | } |