diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-04-06 14:01:46 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-07 16:48:18 -0400 |
commit | bb72b7e2ed215b26e1d9b94534c24ab4cfa52801 (patch) | |
tree | 2a8e781838616f4640d7ef3e5c04ae7d996e0ecf /drivers/gpu/nvgpu/gm20b/fb_gm20b.c | |
parent | 85f27cec5d010d4ac0f4646f11f145d4b3a122e4 (diff) |
gpu: nvgpu: gm20b: 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: Ic27fb98e03a982e5a1cf672cb4e8f87ecea10a5b
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1457345
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b/fb_gm20b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/fb_gm20b.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/fb_gm20b.c b/drivers/gpu/nvgpu/gm20b/fb_gm20b.c index 9c5b730b..c49d2da9 100644 --- a/drivers/gpu/nvgpu/gm20b/fb_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/fb_gm20b.c | |||
@@ -121,7 +121,7 @@ static void gm20b_fb_dump_vpr_wpr_info(struct gk20a *g) | |||
121 | val &= ~0x3; | 121 | val &= ~0x3; |
122 | val |= fb_mmu_vpr_info_index_addr_lo_v(); | 122 | val |= fb_mmu_vpr_info_index_addr_lo_v(); |
123 | gk20a_writel(g, fb_mmu_vpr_info_r(), val); | 123 | gk20a_writel(g, fb_mmu_vpr_info_r(), val); |
124 | gk20a_err(dev_from_gk20a(g), "VPR: %08x %08x %08x %08x", | 124 | nvgpu_err(g, "VPR: %08x %08x %08x %08x", |
125 | gk20a_readl(g, fb_mmu_vpr_info_r()), | 125 | gk20a_readl(g, fb_mmu_vpr_info_r()), |
126 | gk20a_readl(g, fb_mmu_vpr_info_r()), | 126 | gk20a_readl(g, fb_mmu_vpr_info_r()), |
127 | gk20a_readl(g, fb_mmu_vpr_info_r()), | 127 | gk20a_readl(g, fb_mmu_vpr_info_r()), |
@@ -131,7 +131,7 @@ static void gm20b_fb_dump_vpr_wpr_info(struct gk20a *g) | |||
131 | val &= ~0xf; | 131 | val &= ~0xf; |
132 | val |= (fb_mmu_wpr_info_index_allow_read_v()); | 132 | val |= (fb_mmu_wpr_info_index_allow_read_v()); |
133 | gk20a_writel(g, fb_mmu_wpr_info_r(), val); | 133 | gk20a_writel(g, fb_mmu_wpr_info_r(), val); |
134 | gk20a_err(dev_from_gk20a(g), "WPR: %08x %08x %08x %08x %08x %08x", | 134 | nvgpu_err(g, "WPR: %08x %08x %08x %08x %08x %08x", |
135 | gk20a_readl(g, fb_mmu_wpr_info_r()), | 135 | gk20a_readl(g, fb_mmu_wpr_info_r()), |
136 | gk20a_readl(g, fb_mmu_wpr_info_r()), | 136 | gk20a_readl(g, fb_mmu_wpr_info_r()), |
137 | gk20a_readl(g, fb_mmu_wpr_info_r()), | 137 | gk20a_readl(g, fb_mmu_wpr_info_r()), |