From a84e69d6937f94e5bd6cfabee5a3e14216b92b3b Mon Sep 17 00:00:00 2001 From: Philip Elcan Date: Tue, 2 Oct 2018 16:31:45 -0400 Subject: [PATCH] gpu: nvgpu: fifo_gk20: make pbdma_id type the same The use of the pbdma_id value was not consistent. This caused MISRA 10.3 violations due to the assignment between different essential types. JIRA NVGPU-647 Change-Id: I1d25748ee64bacf659bb5c3b65f26e5721c4670c Signed-off-by: Philip Elcan Reviewed-on: https://git-master.nvidia.com/r/1917634 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 6 +++--- drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index 05346d240..ce8a46993 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c @@ -2551,14 +2551,14 @@ static u32 fifo_error_isr(struct gk20a *g, u32 fifo_intr) return handled; } -static inline void gk20a_fifo_reset_pbdma_header(struct gk20a *g, int pbdma_id) +static inline void gk20a_fifo_reset_pbdma_header(struct gk20a *g, u32 pbdma_id) { gk20a_writel(g, pbdma_pb_header_r(pbdma_id), pbdma_pb_header_first_true_f() | pbdma_pb_header_type_non_inc_f()); } -void gk20a_fifo_reset_pbdma_method(struct gk20a *g, int pbdma_id, +void gk20a_fifo_reset_pbdma_method(struct gk20a *g, u32 pbdma_id, int pbdma_method_index) { u32 pbdma_method_stride; @@ -2577,7 +2577,7 @@ void gk20a_fifo_reset_pbdma_method(struct gk20a *g, int pbdma_id, pbdma_udma_nop_r() >> 2)); } -static bool gk20a_fifo_is_sw_method_subch(struct gk20a *g, int pbdma_id, +static bool gk20a_fifo_is_sw_method_subch(struct gk20a *g, u32 pbdma_id, int pbdma_method_index) { u32 pbdma_method_stride; diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h index d1ac1c007..70f40c463 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h @@ -432,7 +432,7 @@ bool gk20a_fifo_check_tsg_ctxsw_timeout(struct tsg_gk20a *tsg, bool *verbose, u32 *ms); bool gk20a_fifo_handle_sched_error(struct gk20a *g); -void gk20a_fifo_reset_pbdma_method(struct gk20a *g, int pbdma_id, +void gk20a_fifo_reset_pbdma_method(struct gk20a *g, u32 pbdma_id, int pbdma_method_index); unsigned int gk20a_fifo_handle_pbdma_intr_0(struct gk20a *g, u32 pbdma_id, u32 pbdma_intr_0, u32 *handled, u32 *error_notifier);