From 5405070ecd27ce462babc1dff231fec5cd8bd6b7 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 6 Apr 2017 13:10:30 -0700 Subject: gpu: nvgpu: vgpu: 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: I071e8c50959bfa81730ca964d912bc69f9c7e6ad Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1457355 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'drivers/gpu/nvgpu/vgpu/fifo_vgpu.c') diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c index e2883f7c..e775abbb 100644 --- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c @@ -78,7 +78,7 @@ static int vgpu_channel_alloc_inst(struct gk20a *g, struct channel_gk20a *ch) p->pid = (u64)current->tgid; err = vgpu_comm_sendrecv(&msg, sizeof(msg), sizeof(msg)); if (err || msg.ret) { - gk20a_err(dev_from_gk20a(g), "fail"); + nvgpu_err(g, "fail"); return -ENOMEM; } @@ -365,21 +365,20 @@ static int vgpu_init_fifo_setup_hw(struct gk20a *g) smp_mb(); if (v1 != gk20a_bar1_readl(g, bar1_vaddr)) { - gk20a_err(dev_from_gk20a(g), "bar1 broken @ gk20a!"); + nvgpu_err(g, "bar1 broken @ gk20a!"); return -EINVAL; } gk20a_bar1_writel(g, bar1_vaddr, v2); if (v2 != gk20a_bar1_readl(g, bar1_vaddr)) { - gk20a_err(dev_from_gk20a(g), "bar1 broken @ gk20a!"); + nvgpu_err(g, "bar1 broken @ gk20a!"); return -EINVAL; } /* is it visible to the cpu? */ if (*cpu_vaddr != v2) { - gk20a_err(dev_from_gk20a(g), - "cpu didn't see bar1 write @ %p!", + nvgpu_err(g, "cpu didn't see bar1 write @ %p!", cpu_vaddr); } @@ -426,7 +425,7 @@ static int vgpu_fifo_preempt_channel(struct gk20a *g, u32 hw_chid) err = vgpu_comm_sendrecv(&msg, sizeof(msg), sizeof(msg)); if (err || msg.ret) { - gk20a_err(dev_from_gk20a(g), + nvgpu_err(g, "preempt channel %d failed\n", hw_chid); err = -ENOMEM; } @@ -450,7 +449,7 @@ static int vgpu_fifo_preempt_tsg(struct gk20a *g, u32 tsgid) err = err ? err : msg.ret; if (err) { - gk20a_err(dev_from_gk20a(g), + nvgpu_err(g, "preempt tsg %u failed\n", tsgid); } @@ -722,7 +721,7 @@ int vgpu_fifo_isr(struct gk20a *g, struct tegra_vgpu_fifo_intr_info *info) if (!ch) return 0; - gk20a_err(dev_from_gk20a(g), "fifo intr (%d) on ch %u", + nvgpu_err(g, "fifo intr (%d) on ch %u", info->type, info->chid); trace_gk20a_channel_reset(ch->hw_chid, ch->tsgid); -- cgit v1.2.2