diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/debug.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/log.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/log.h | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/debug.c b/drivers/gpu/nvgpu/common/linux/debug.c index 80a1f7db..a458a3d4 100644 --- a/drivers/gpu/nvgpu/common/linux/debug.c +++ b/drivers/gpu/nvgpu/common/linux/debug.c | |||
@@ -308,11 +308,11 @@ void gk20a_debug_init(struct gk20a *g, const char *debugfs_symlink) | |||
308 | l->debugfs, &g->disable_syncpoints); | 308 | l->debugfs, &g->disable_syncpoints); |
309 | 309 | ||
310 | /* Legacy debugging API. */ | 310 | /* Legacy debugging API. */ |
311 | debugfs_create_u32("dbg_mask", S_IRUGO|S_IWUSR, | 311 | debugfs_create_u64("dbg_mask", S_IRUGO|S_IWUSR, |
312 | l->debugfs, &nvgpu_dbg_mask); | 312 | l->debugfs, &nvgpu_dbg_mask); |
313 | 313 | ||
314 | /* New debug logging API. */ | 314 | /* New debug logging API. */ |
315 | debugfs_create_u32("log_mask", S_IRUGO|S_IWUSR, | 315 | debugfs_create_u64("log_mask", S_IRUGO|S_IWUSR, |
316 | l->debugfs, &g->log_mask); | 316 | l->debugfs, &g->log_mask); |
317 | debugfs_create_u32("log_trace", S_IRUGO|S_IWUSR, | 317 | debugfs_create_u32("log_trace", S_IRUGO|S_IWUSR, |
318 | l->debugfs, &g->log_trace); | 318 | l->debugfs, &g->log_trace); |
diff --git a/drivers/gpu/nvgpu/common/linux/log.c b/drivers/gpu/nvgpu/common/linux/log.c index 01d3add1..4dc8f667 100644 --- a/drivers/gpu/nvgpu/common/linux/log.c +++ b/drivers/gpu/nvgpu/common/linux/log.c | |||
@@ -38,7 +38,7 @@ | |||
38 | */ | 38 | */ |
39 | #define LOG_FMT "nvgpu: %s %33s:%-4d [%s] %s\n" | 39 | #define LOG_FMT "nvgpu: %s %33s:%-4d [%s] %s\n" |
40 | 40 | ||
41 | u32 nvgpu_dbg_mask = NVGPU_DEFAULT_DBG_MASK; | 41 | u64 nvgpu_dbg_mask = NVGPU_DEFAULT_DBG_MASK; |
42 | 42 | ||
43 | static const char *log_types[] = { | 43 | static const char *log_types[] = { |
44 | "ERR", | 44 | "ERR", |
@@ -47,7 +47,7 @@ static const char *log_types[] = { | |||
47 | "INFO", | 47 | "INFO", |
48 | }; | 48 | }; |
49 | 49 | ||
50 | int nvgpu_log_mask_enabled(struct gk20a *g, u32 log_mask) | 50 | int nvgpu_log_mask_enabled(struct gk20a *g, u64 log_mask) |
51 | { | 51 | { |
52 | return !!(g->log_mask & log_mask); | 52 | return !!(g->log_mask & log_mask); |
53 | } | 53 | } |
@@ -115,7 +115,7 @@ void __nvgpu_log_msg(struct gk20a *g, const char *func_name, int line, | |||
115 | } | 115 | } |
116 | 116 | ||
117 | __attribute__((format (printf, 5, 6))) | 117 | __attribute__((format (printf, 5, 6))) |
118 | void __nvgpu_log_dbg(struct gk20a *g, u32 log_mask, | 118 | void __nvgpu_log_dbg(struct gk20a *g, u64 log_mask, |
119 | const char *func_name, int line, | 119 | const char *func_name, int line, |
120 | const char *fmt, ...) | 120 | const char *fmt, ...) |
121 | { | 121 | { |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index b5ebb9ba..d61423d1 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -1233,7 +1233,7 @@ struct gk20a { | |||
1233 | bool suspended; | 1233 | bool suspended; |
1234 | bool sw_ready; | 1234 | bool sw_ready; |
1235 | 1235 | ||
1236 | u32 log_mask; | 1236 | u64 log_mask; |
1237 | u32 log_trace; | 1237 | u32 log_trace; |
1238 | 1238 | ||
1239 | struct nvgpu_gpu_params params; | 1239 | struct nvgpu_gpu_params params; |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/log.h b/drivers/gpu/nvgpu/include/nvgpu/log.h index 183948cd..897dcfc6 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/log.h +++ b/drivers/gpu/nvgpu/include/nvgpu/log.h | |||
@@ -44,7 +44,7 @@ void __nvgpu_log_msg(struct gk20a *g, const char *func_name, int line, | |||
44 | enum nvgpu_log_type type, const char *fmt, ...); | 44 | enum nvgpu_log_type type, const char *fmt, ...); |
45 | 45 | ||
46 | __attribute__((format (printf, 5, 6))) | 46 | __attribute__((format (printf, 5, 6))) |
47 | void __nvgpu_log_dbg(struct gk20a *g, u32 log_mask, | 47 | void __nvgpu_log_dbg(struct gk20a *g, u64 log_mask, |
48 | const char *func_name, int line, | 48 | const char *func_name, int line, |
49 | const char *fmt, ...); | 49 | const char *fmt, ...); |
50 | 50 | ||
@@ -92,7 +92,7 @@ void __nvgpu_log_dbg(struct gk20a *g, u32 log_mask, | |||
92 | * said prints would not happen. For example for-loops of log statements in | 92 | * said prints would not happen. For example for-loops of log statements in |
93 | * critical paths. | 93 | * critical paths. |
94 | */ | 94 | */ |
95 | int nvgpu_log_mask_enabled(struct gk20a *g, u32 log_mask); | 95 | int nvgpu_log_mask_enabled(struct gk20a *g, u64 log_mask); |
96 | 96 | ||
97 | /** | 97 | /** |
98 | * nvgpu_log - Print a debug message | 98 | * nvgpu_log - Print a debug message |
@@ -164,7 +164,7 @@ int nvgpu_log_mask_enabled(struct gk20a *g, u32 log_mask); | |||
164 | * This exist for backwards compatibility with the old debug/logging API. If you | 164 | * This exist for backwards compatibility with the old debug/logging API. If you |
165 | * want ftrace support use the new API! | 165 | * want ftrace support use the new API! |
166 | */ | 166 | */ |
167 | extern u32 nvgpu_dbg_mask; | 167 | extern u64 nvgpu_dbg_mask; |
168 | 168 | ||
169 | #define gk20a_dbg(log_mask, fmt, arg...) \ | 169 | #define gk20a_dbg(log_mask, fmt, arg...) \ |
170 | do { \ | 170 | do { \ |