summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/ltc_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/ltc_gk20a.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
index 1b9d515c..f8416d55 100644
--- a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
@@ -20,6 +20,7 @@
20 20
21#include <trace/events/gk20a.h> 21#include <trace/events/gk20a.h>
22#include <nvgpu/timers.h> 22#include <nvgpu/timers.h>
23#include <nvgpu/log.h>
23 24
24#include "gk20a.h" 25#include "gk20a.h"
25 26
@@ -160,8 +161,7 @@ static int gk20a_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op,
160 } while (!nvgpu_timeout_expired(&timeout)); 161 } while (!nvgpu_timeout_expired(&timeout));
161 162
162 if (nvgpu_timeout_peek_expired(&timeout)) { 163 if (nvgpu_timeout_peek_expired(&timeout)) {
163 gk20a_err(dev_from_gk20a(g), 164 nvgpu_err(g, "comp tag clear timeout");
164 "comp tag clear timeout\n");
165 err = -EBUSY; 165 err = -EBUSY;
166 goto out; 166 goto out;
167 } 167 }
@@ -186,7 +186,7 @@ static void gk20a_ltc_isr(struct gk20a *g)
186 u32 intr; 186 u32 intr;
187 187
188 intr = gk20a_readl(g, ltc_ltc0_ltss_intr_r()); 188 intr = gk20a_readl(g, ltc_ltc0_ltss_intr_r());
189 gk20a_err(dev_from_gk20a(g), "ltc: %08x\n", intr); 189 nvgpu_err(g, "ltc: %08x\n", intr);
190 gk20a_writel(g, ltc_ltc0_ltss_intr_r(), intr); 190 gk20a_writel(g, ltc_ltc0_ltss_intr_r(), intr);
191} 191}
192 192
@@ -215,7 +215,7 @@ static int gk20a_determine_L2_size_bytes(struct gk20a *g)
215 ltc_ltc0_lts0_tstg_cfg1_active_sets_quarter_v()) { 215 ltc_ltc0_lts0_tstg_cfg1_active_sets_quarter_v()) {
216 sets = 16; 216 sets = 16;
217 } else { 217 } else {
218 dev_err(dev_from_gk20a(g), 218 nvgpu_err(g,
219 "Unknown constant %u for active sets", 219 "Unknown constant %u for active sets",
220 (unsigned)active_sets_value); 220 (unsigned)active_sets_value);
221 sets = 0; 221 sets = 0;