From 57d624f900896a257e2e918e93e99a14f734aea5 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 6 Apr 2017 10:55:48 -0700 Subject: gpu: nvgpu: gp10b: Use new error macros gk20a_err() and gk20a_warn() require a struct device pointer, which is not portable across operating systems. The new nvgpu_err() and nvgpu_warn() macros take struct gk20a pointer. Convert code to use the more portable macros. JIRA NVGPU-16 Change-Id: I8dc0ddf3b6ea38af6300c27558b60786c163da6d Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1457344 Reviewed-by: svccoveritychecker Reviewed-by: Alex Waterman GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/gp10b/ltc_gp10b.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/gp10b/ltc_gp10b.c') diff --git a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c index e1aa34a9..42bfbf29 100644 --- a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c @@ -18,6 +18,8 @@ #include "gk20a/gk20a.h" #include "gm20b/ltc_gm20b.h" +#include + #include #include @@ -128,8 +130,7 @@ static void gp10b_ltc_isr(struct gk20a *g) u32 lts_stride = nvgpu_get_litter_value(g, GPU_LIT_LTS_STRIDE); mc_intr = gk20a_readl(g, mc_intr_ltc_r()); - gk20a_err(dev_from_gk20a(g), "mc_ltc_intr: %08x", - mc_intr); + nvgpu_err(g, "mc_ltc_intr: %08x", mc_intr); for (ltc = 0; ltc < g->ltc_count; ltc++) { if ((mc_intr & 1 << ltc) == 0) continue; @@ -142,7 +143,7 @@ static void gp10b_ltc_isr(struct gk20a *g) ltc_ltcs_ltss_intr_ecc_sec_error_pending_f()) { u32 ecc_stats_reg_val; - gk20a_err(dev_from_gk20a(g), + nvgpu_err(g, "Single bit error detected in GPU L2!"); ecc_stats_reg_val = @@ -162,7 +163,7 @@ static void gp10b_ltc_isr(struct gk20a *g) ltc_ltcs_ltss_intr_ecc_ded_error_pending_f()) { u32 ecc_stats_reg_val; - gk20a_err(dev_from_gk20a(g), + nvgpu_err(g, "Double bit error detected in GPU L2!"); ecc_stats_reg_val = @@ -177,7 +178,7 @@ static void gp10b_ltc_isr(struct gk20a *g) ecc_stats_reg_val); } - gk20a_err(dev_from_gk20a(g), "ltc%d, slice %d: %08x", + nvgpu_err(g, "ltc%d, slice %d: %08x", ltc, slice, ltc_intr); gk20a_writel(g, ltc_ltc0_lts0_intr_r() + ltc_stride * ltc + lts_stride * slice, -- cgit v1.2.2