summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gp10b/ce_gp10b.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2018-04-18 22:39:46 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-05-09 21:26:04 -0400
commitdd739fcb039d51606e9a5454ec0aab17bcb01965 (patch)
tree806ba8575d146367ad1be00086ca0cdae35a6b28 /drivers/gpu/nvgpu/gp10b/ce_gp10b.c
parent7e66f2a63d4855e763fa768047dfc32f6f96b771 (diff)
gpu: nvgpu: Remove gk20a_dbg* functions
Switch all logging to nvgpu_log*(). gk20a_dbg* macros are intentionally left there because of use from other repositories. Because the new functions do not work without a pointer to struct gk20a, and piping it just for logging is excessive, some log messages are deleted. Change-Id: I00e22e75fe4596a330bb0282ab4774b3639ee31e Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1704148 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b/ce_gp10b.c')
-rw-r--r--drivers/gpu/nvgpu/gp10b/ce_gp10b.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/ce_gp10b.c b/drivers/gpu/nvgpu/gp10b/ce_gp10b.c
index 86a2b751..e2ad1bd3 100644
--- a/drivers/gpu/nvgpu/gp10b/ce_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/ce_gp10b.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * Pascal GPU series Copy Engine. 2 * Pascal GPU series Copy Engine.
3 * 3 *
4 * Copyright (c) 2011-2017, NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2011-2018, NVIDIA CORPORATION. All rights reserved.
5 * 5 *
6 * Permission is hereby granted, free of charge, to any person obtaining a 6 * Permission is hereby granted, free of charge, to any person obtaining a
7 * copy of this software and associated documentation files (the "Software"), 7 * copy of this software and associated documentation files (the "Software"),
@@ -30,14 +30,14 @@
30 30
31static u32 ce_blockpipe_isr(struct gk20a *g, u32 fifo_intr) 31static u32 ce_blockpipe_isr(struct gk20a *g, u32 fifo_intr)
32{ 32{
33 gk20a_dbg(gpu_dbg_intr, "ce blocking pipe interrupt\n"); 33 nvgpu_log(g, gpu_dbg_intr, "ce blocking pipe interrupt\n");
34 34
35 return ce_intr_status_blockpipe_pending_f(); 35 return ce_intr_status_blockpipe_pending_f();
36} 36}
37 37
38static u32 ce_launcherr_isr(struct gk20a *g, u32 fifo_intr) 38static u32 ce_launcherr_isr(struct gk20a *g, u32 fifo_intr)
39{ 39{
40 gk20a_dbg(gpu_dbg_intr, "ce launch error interrupt\n"); 40 nvgpu_log(g, gpu_dbg_intr, "ce launch error interrupt\n");
41 41
42 return ce_intr_status_launcherr_pending_f(); 42 return ce_intr_status_launcherr_pending_f();
43} 43}
@@ -47,7 +47,7 @@ void gp10b_ce_isr(struct gk20a *g, u32 inst_id, u32 pri_base)
47 u32 ce_intr = gk20a_readl(g, ce_intr_status_r(inst_id)); 47 u32 ce_intr = gk20a_readl(g, ce_intr_status_r(inst_id));
48 u32 clear_intr = 0; 48 u32 clear_intr = 0;
49 49
50 gk20a_dbg(gpu_dbg_intr, "ce isr %08x %08x\n", ce_intr, inst_id); 50 nvgpu_log(g, gpu_dbg_intr, "ce isr %08x %08x\n", ce_intr, inst_id);
51 51
52 /* clear blocking interrupts: they exibit broken behavior */ 52 /* clear blocking interrupts: they exibit broken behavior */
53 if (ce_intr & ce_intr_status_blockpipe_pending_f()) 53 if (ce_intr & ce_intr_status_blockpipe_pending_f())
@@ -65,7 +65,7 @@ int gp10b_ce_nonstall_isr(struct gk20a *g, u32 inst_id, u32 pri_base)
65 int ops = 0; 65 int ops = 0;
66 u32 ce_intr = gk20a_readl(g, ce_intr_status_r(inst_id)); 66 u32 ce_intr = gk20a_readl(g, ce_intr_status_r(inst_id));
67 67
68 gk20a_dbg(gpu_dbg_intr, "ce nonstall isr %08x %08x\n", ce_intr, inst_id); 68 nvgpu_log(g, gpu_dbg_intr, "ce nonstall isr %08x %08x\n", ce_intr, inst_id);
69 69
70 if (ce_intr & ce_intr_status_nonblockpipe_pending_f()) { 70 if (ce_intr & ce_intr_status_nonblockpipe_pending_f()) {
71 gk20a_writel(g, ce_intr_status_r(inst_id), 71 gk20a_writel(g, ce_intr_status_r(inst_id),