diff options
26 files changed, 90 insertions, 90 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/allocator.h b/drivers/gpu/nvgpu/include/nvgpu/allocator.h index d722673d..c444543e 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/allocator.h +++ b/drivers/gpu/nvgpu/include/nvgpu/allocator.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef __NVGPU_ALLOCATOR_H__ | 23 | #ifndef NVGPU_ALLOCATOR_H |
24 | #define __NVGPU_ALLOCATOR_H__ | 24 | #define NVGPU_ALLOCATOR_H |
25 | 25 | ||
26 | #ifdef __KERNEL__ | 26 | #ifdef __KERNEL__ |
27 | /* | 27 | /* |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/atomic.h b/drivers/gpu/nvgpu/include/nvgpu/atomic.h index 12d1c86e..3edc1fc6 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/atomic.h +++ b/drivers/gpu/nvgpu/include/nvgpu/atomic.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -19,8 +19,8 @@ | |||
19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | #ifndef __NVGPU_ATOMIC_H__ | 22 | #ifndef NVGPU_ATOMIC_H |
23 | #define __NVGPU_ATOMIC_H__ | 23 | #define NVGPU_ATOMIC_H |
24 | 24 | ||
25 | #ifdef __KERNEL__ | 25 | #ifdef __KERNEL__ |
26 | #include <nvgpu/linux/atomic.h> | 26 | #include <nvgpu/linux/atomic.h> |
@@ -127,4 +127,4 @@ static inline long nvgpu_atomic64_sub_return(long x, nvgpu_atomic64_t *v) | |||
127 | return __nvgpu_atomic64_sub_return(x, v); | 127 | return __nvgpu_atomic64_sub_return(x, v); |
128 | } | 128 | } |
129 | 129 | ||
130 | #endif /* __NVGPU_ATOMIC_H__ */ | 130 | #endif /* NVGPU_ATOMIC_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/barrier.h b/drivers/gpu/nvgpu/include/nvgpu/barrier.h index 49b10b86..f0b6b2b1 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/barrier.h +++ b/drivers/gpu/nvgpu/include/nvgpu/barrier.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -25,8 +25,8 @@ | |||
25 | * should provide their own OS specific calls under this common API | 25 | * should provide their own OS specific calls under this common API |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #ifndef __NVGPU_BARRIER_H__ | 28 | #ifndef NVGPU_BARRIER_H |
29 | #define __NVGPU_BARRIER_H__ | 29 | #define NVGPU_BARRIER_H |
30 | 30 | ||
31 | #ifdef __KERNEL__ | 31 | #ifdef __KERNEL__ |
32 | #include <nvgpu/linux/barrier.h> | 32 | #include <nvgpu/linux/barrier.h> |
@@ -58,4 +58,4 @@ | |||
58 | #define nvgpu_speculation_barrier() | 58 | #define nvgpu_speculation_barrier() |
59 | #endif | 59 | #endif |
60 | 60 | ||
61 | #endif /* __NVGPU_BARRIER_H__ */ | 61 | #endif /* NVGPU_BARRIER_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/bitops.h b/drivers/gpu/nvgpu/include/nvgpu/bitops.h index b6666930..00336d02 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/bitops.h +++ b/drivers/gpu/nvgpu/include/nvgpu/bitops.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -19,8 +19,8 @@ | |||
19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | #ifndef __NVGPU_BITOPS_H__ | 22 | #ifndef NVGPU_BITOPS_H |
23 | #define __NVGPU_BITOPS_H__ | 23 | #define NVGPU_BITOPS_H |
24 | 24 | ||
25 | #include <nvgpu/types.h> | 25 | #include <nvgpu/types.h> |
26 | 26 | ||
@@ -41,4 +41,4 @@ | |||
41 | #include <nvgpu_rmos/include/bitops.h> | 41 | #include <nvgpu_rmos/include/bitops.h> |
42 | #endif | 42 | #endif |
43 | 43 | ||
44 | #endif | 44 | #endif /* NVGPU_BITOPS_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/bug.h b/drivers/gpu/nvgpu/include/nvgpu/bug.h index 671439a1..3d139b75 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/bug.h +++ b/drivers/gpu/nvgpu/include/nvgpu/bug.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -19,8 +19,8 @@ | |||
19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | #ifndef __NVGPU_BUG_H__ | 22 | #ifndef NVGPU_BUG_H |
23 | #define __NVGPU_BUG_H__ | 23 | #define NVGPU_BUG_H |
24 | 24 | ||
25 | #ifdef __KERNEL__ | 25 | #ifdef __KERNEL__ |
26 | #include <linux/bug.h> | 26 | #include <linux/bug.h> |
@@ -30,4 +30,4 @@ | |||
30 | #include <nvgpu_rmos/include/bug.h> | 30 | #include <nvgpu_rmos/include/bug.h> |
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | #endif | 33 | #endif /* NVGPU_BUG_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/comptags.h b/drivers/gpu/nvgpu/include/nvgpu/comptags.h index 3e87259e..3df1b6fc 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/comptags.h +++ b/drivers/gpu/nvgpu/include/nvgpu/comptags.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef __NVGPU_COMPTAGS__ | 23 | #ifndef NVGPU_COMPTAGS_H |
24 | #define __NVGPU_COMPTAGS__ | 24 | #define NVGPU_COMPTAGS_H |
25 | 25 | ||
26 | #include <nvgpu/lock.h> | 26 | #include <nvgpu/lock.h> |
27 | #include <nvgpu/types.h> | 27 | #include <nvgpu/types.h> |
@@ -101,4 +101,4 @@ bool gk20a_comptags_start_clear(struct nvgpu_os_buffer *buf); | |||
101 | void gk20a_comptags_finish_clear(struct nvgpu_os_buffer *buf, | 101 | void gk20a_comptags_finish_clear(struct nvgpu_os_buffer *buf, |
102 | bool clear_successful); | 102 | bool clear_successful); |
103 | 103 | ||
104 | #endif | 104 | #endif /* NVGPU_COMPTAGS_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/cond.h b/drivers/gpu/nvgpu/include/nvgpu/cond.h index 340fb460..49e9d1f9 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/cond.h +++ b/drivers/gpu/nvgpu/include/nvgpu/cond.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef __NVGPU_COND_H__ | 23 | #ifndef NVGPU_COND_H |
24 | #define __NVGPU_COND_H__ | 24 | #define NVGPU_COND_H |
25 | 25 | ||
26 | #ifdef __KERNEL__ | 26 | #ifdef __KERNEL__ |
27 | #include <nvgpu/linux/cond.h> | 27 | #include <nvgpu/linux/cond.h> |
@@ -103,4 +103,4 @@ int nvgpu_cond_broadcast_interruptible(struct nvgpu_cond *cond); | |||
103 | */ | 103 | */ |
104 | void nvgpu_cond_destroy(struct nvgpu_cond *cond); | 104 | void nvgpu_cond_destroy(struct nvgpu_cond *cond); |
105 | 105 | ||
106 | #endif /* __NVGPU_COND_H__ */ | 106 | #endif /* NVGPU_COND_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/enabled.h b/drivers/gpu/nvgpu/include/nvgpu/enabled.h index 54c4d61c..ccf60546 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/enabled.h +++ b/drivers/gpu/nvgpu/include/nvgpu/enabled.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef __NVGPU_ENABLED_H__ | 23 | #ifndef NVGPU_ENABLED_H |
24 | #define __NVGPU_ENABLED_H__ | 24 | #define NVGPU_ENABLED_H |
25 | 25 | ||
26 | struct gk20a; | 26 | struct gk20a; |
27 | 27 | ||
@@ -199,4 +199,4 @@ void __nvgpu_set_enabled(struct gk20a *g, int flag, bool state); | |||
199 | int nvgpu_init_enabled_flags(struct gk20a *g); | 199 | int nvgpu_init_enabled_flags(struct gk20a *g); |
200 | void nvgpu_free_enabled_flags(struct gk20a *g); | 200 | void nvgpu_free_enabled_flags(struct gk20a *g); |
201 | 201 | ||
202 | #endif | 202 | #endif /* NVGPU_ENABLED_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/falcon.h b/drivers/gpu/nvgpu/include/nvgpu/falcon.h index 4541f228..9f8c97ea 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/falcon.h +++ b/drivers/gpu/nvgpu/include/nvgpu/falcon.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef __FALCON_H__ | 23 | #ifndef NVGPU_FALCON_H |
24 | #define __FALCON_H__ | 24 | #define NVGPU_FALCON_H |
25 | 25 | ||
26 | #include <nvgpu/types.h> | 26 | #include <nvgpu/types.h> |
27 | #include <nvgpu/lock.h> | 27 | #include <nvgpu/lock.h> |
@@ -320,4 +320,4 @@ void nvgpu_flcn_queue_free(struct nvgpu_falcon *flcn, | |||
320 | 320 | ||
321 | int nvgpu_flcn_sw_init(struct gk20a *g, u32 flcn_id); | 321 | int nvgpu_flcn_sw_init(struct gk20a *g, u32 flcn_id); |
322 | 322 | ||
323 | #endif /* __FALCON_H__ */ | 323 | #endif /* NVGPU_FALCON_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/flcnif_cmn.h b/drivers/gpu/nvgpu/include/nvgpu/flcnif_cmn.h index d146cac7..ab27e6c6 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/flcnif_cmn.h +++ b/drivers/gpu/nvgpu/include/nvgpu/flcnif_cmn.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef __FLCNIFCMN_H__ | 23 | #ifndef NVGPU_FLCNIF_CMN_H |
24 | #define __FLCNIFCMN_H__ | 24 | #define NVGPU_FLCNIF_CMN_H |
25 | 25 | ||
26 | #define PMU_CMD_SUBMIT_PAYLOAD_PARAMS_FB_SIZE_UNUSED 0 | 26 | #define PMU_CMD_SUBMIT_PAYLOAD_PARAMS_FB_SIZE_UNUSED 0 |
27 | 27 | ||
@@ -116,4 +116,4 @@ typedef u8 flcn_status; | |||
116 | 116 | ||
117 | #define NV_UNSIGNED_ROUNDED_DIV(a, b) (((a) + ((b) / 2)) / (b)) | 117 | #define NV_UNSIGNED_ROUNDED_DIV(a, b) (((a) + ((b) / 2)) / (b)) |
118 | 118 | ||
119 | #endif /* _FLCNIFCMN_H_*/ | 119 | #endif /* NVGPU_FLCNIF_CMN_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gmmu.h b/drivers/gpu/nvgpu/include/nvgpu/gmmu.h index aa110f18..a70015f8 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/gmmu.h +++ b/drivers/gpu/nvgpu/include/nvgpu/gmmu.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef __NVGPU_GMMU_H__ | 23 | #ifndef NVGPU_GMMU_H |
24 | #define __NVGPU_GMMU_H__ | 24 | #define NVGPU_GMMU_H |
25 | 25 | ||
26 | #include <nvgpu/types.h> | 26 | #include <nvgpu/types.h> |
27 | #include <nvgpu/nvgpu_mem.h> | 27 | #include <nvgpu/nvgpu_mem.h> |
@@ -336,4 +336,4 @@ int __nvgpu_set_pte(struct gk20a *g, struct vm_gk20a *vm, u64 vaddr, u32 *pte); | |||
336 | nvgpu_log(g, gpu_dbg_pte, fmt, ##args); \ | 336 | nvgpu_log(g, gpu_dbg_pte, fmt, ##args); \ |
337 | } while (0) | 337 | } while (0) |
338 | 338 | ||
339 | #endif | 339 | #endif /* NVGPU_GMMU_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/kmem.h b/drivers/gpu/nvgpu/include/nvgpu/kmem.h index 852f6f8a..61f90bf5 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/kmem.h +++ b/drivers/gpu/nvgpu/include/nvgpu/kmem.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef __NVGPU_KMEM_H__ | 23 | #ifndef NVGPU_KMEM_H |
24 | #define __NVGPU_KMEM_H__ | 24 | #define NVGPU_KMEM_H |
25 | 25 | ||
26 | #include <nvgpu/types.h> | 26 | #include <nvgpu/types.h> |
27 | #include <nvgpu/utils.h> | 27 | #include <nvgpu/utils.h> |
@@ -282,4 +282,4 @@ static inline void *nvgpu_big_zalloc(struct gk20a *g, size_t size) | |||
282 | */ | 282 | */ |
283 | void nvgpu_big_free(struct gk20a *g, void *p); | 283 | void nvgpu_big_free(struct gk20a *g, void *p); |
284 | 284 | ||
285 | #endif /* __NVGPU_KMEM_H__ */ | 285 | #endif /* NVGPU_KMEM_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/kref.h b/drivers/gpu/nvgpu/include/nvgpu/kref.h index 2cbc07bc..486040e8 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/kref.h +++ b/drivers/gpu/nvgpu/include/nvgpu/kref.h | |||
@@ -23,8 +23,8 @@ | |||
23 | /* | 23 | /* |
24 | * The following structure is used for reference counting of objects in nvgpu. | 24 | * The following structure is used for reference counting of objects in nvgpu. |
25 | */ | 25 | */ |
26 | #ifndef __NVGPU_KREF_H__ | 26 | #ifndef NVGPU_KREF_H |
27 | #define __NVGPU_KREF_H__ | 27 | #define NVGPU_KREF_H |
28 | 28 | ||
29 | #include <nvgpu/atomic.h> | 29 | #include <nvgpu/atomic.h> |
30 | 30 | ||
@@ -84,4 +84,4 @@ static inline int __must_check nvgpu_ref_get_unless_zero(struct nvgpu_ref *ref) | |||
84 | return nvgpu_atomic_add_unless(&ref->refcount, 1, 0); | 84 | return nvgpu_atomic_add_unless(&ref->refcount, 1, 0); |
85 | } | 85 | } |
86 | 86 | ||
87 | #endif /* __NVGPU_KREF_H__ */ | 87 | #endif /* NVGPU_KREF_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/log.h b/drivers/gpu/nvgpu/include/nvgpu/log.h index e64c72f3..70a16762 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/log.h +++ b/drivers/gpu/nvgpu/include/nvgpu/log.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef __NVGPU_DEBUGGING_H__ | 23 | #ifndef NVGPU_LOG_H |
24 | #define __NVGPU_DEBUGGING_H__ | 24 | #define NVGPU_LOG_H |
25 | 25 | ||
26 | #include <nvgpu/types.h> | 26 | #include <nvgpu/types.h> |
27 | #include <nvgpu/bitops.h> | 27 | #include <nvgpu/bitops.h> |
@@ -180,4 +180,4 @@ extern u64 nvgpu_dbg_mask; | |||
180 | #define gk20a_dbg_fn(fmt, arg...) gk20a_dbg(gpu_dbg_fn, fmt, ##arg) | 180 | #define gk20a_dbg_fn(fmt, arg...) gk20a_dbg(gpu_dbg_fn, fmt, ##arg) |
181 | #define gk20a_dbg_info(fmt, arg...) gk20a_dbg(gpu_dbg_info, fmt, ##arg) | 181 | #define gk20a_dbg_info(fmt, arg...) gk20a_dbg(gpu_dbg_info, fmt, ##arg) |
182 | 182 | ||
183 | #endif | 183 | #endif /* NVGPU_LOG_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/mm.h b/drivers/gpu/nvgpu/include/nvgpu/mm.h index 45641092..01063bc1 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/mm.h +++ b/drivers/gpu/nvgpu/include/nvgpu/mm.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef __NVGPU_MM_H__ | 23 | #ifndef NVGPU_MM_H |
24 | #define __NVGPU_MM_H__ | 24 | #define NVGPU_MM_H |
25 | 25 | ||
26 | #include <nvgpu/types.h> | 26 | #include <nvgpu/types.h> |
27 | #include <nvgpu/cond.h> | 27 | #include <nvgpu/cond.h> |
@@ -220,4 +220,4 @@ int nvgpu_mm_suspend(struct gk20a *g); | |||
220 | u32 nvgpu_mm_get_default_big_page_size(struct gk20a *g); | 220 | u32 nvgpu_mm_get_default_big_page_size(struct gk20a *g); |
221 | u32 nvgpu_mm_get_available_big_page_sizes(struct gk20a *g); | 221 | u32 nvgpu_mm_get_available_big_page_sizes(struct gk20a *g); |
222 | 222 | ||
223 | #endif | 223 | #endif /* NVGPU_MM_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h index 07a088f0..e69274b5 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h +++ b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef __NVGPU_NVGPU_MEM_H__ | 23 | #ifndef NVGPU_MEM_H |
24 | #define __NVGPU_NVGPU_MEM_H__ | 24 | #define NVGPU_MEM_H |
25 | 25 | ||
26 | #include <nvgpu/types.h> | 26 | #include <nvgpu/types.h> |
27 | #include <nvgpu/list.h> | 27 | #include <nvgpu/list.h> |
@@ -347,4 +347,4 @@ u32 nvgpu_aperture_mask(struct gk20a *g, struct nvgpu_mem *mem, | |||
347 | 347 | ||
348 | u64 nvgpu_mem_iommu_translate(struct gk20a *g, u64 phys); | 348 | u64 nvgpu_mem_iommu_translate(struct gk20a *g, u64 phys); |
349 | 349 | ||
350 | #endif | 350 | #endif /* NVGPU_MEM_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvlink.h b/drivers/gpu/nvgpu/include/nvgpu/nvlink.h index aa1b62c5..a74111cd 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/nvlink.h +++ b/drivers/gpu/nvgpu/include/nvgpu/nvlink.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef __NVGPU_NVLINK_H__ | 23 | #ifndef NVGPU_NVLINK_H |
24 | #define __NVGPU_NVLINK_H__ | 24 | #define NVGPU_NVLINK_H |
25 | 25 | ||
26 | #include <nvgpu/types.h> | 26 | #include <nvgpu/types.h> |
27 | 27 | ||
@@ -234,4 +234,4 @@ int nvgpu_nvlink_remove(struct gk20a *g); | |||
234 | 234 | ||
235 | void nvgpu_mss_nvlink_init_credits(struct gk20a *g); | 235 | void nvgpu_mss_nvlink_init_credits(struct gk20a *g); |
236 | 236 | ||
237 | #endif /* __NVGPU_NVLINK_H__ */ | 237 | #endif /* NVGPU_NVLINK_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/pramin.h b/drivers/gpu/nvgpu/include/nvgpu/pramin.h index c9f54a6f..b0914bc1 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/pramin.h +++ b/drivers/gpu/nvgpu/include/nvgpu/pramin.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef __NVGPU_PRAMIN_H__ | 23 | #ifndef NVGPU_PRAMIN_H |
24 | #define __NVGPU_PRAMIN_H__ | 24 | #define NVGPU_PRAMIN_H |
25 | 25 | ||
26 | #include <nvgpu/types.h> | 26 | #include <nvgpu/types.h> |
27 | 27 | ||
@@ -36,4 +36,4 @@ void nvgpu_pramin_memset(struct gk20a *g, struct nvgpu_mem *mem, u32 start, u32 | |||
36 | 36 | ||
37 | void nvgpu_init_pramin(struct mm_gk20a *mm); | 37 | void nvgpu_init_pramin(struct mm_gk20a *mm); |
38 | 38 | ||
39 | #endif | 39 | #endif /* NVGPU_PRAMIN_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/rbtree.h b/drivers/gpu/nvgpu/include/nvgpu/rbtree.h index 25740863..bcbbabbd 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/rbtree.h +++ b/drivers/gpu/nvgpu/include/nvgpu/rbtree.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef __NVGPU_RBTREE_H__ | 23 | #ifndef NVGPU_RBTREE_H |
24 | #define __NVGPU_RBTREE_H__ | 24 | #define NVGPU_RBTREE_H |
25 | 25 | ||
26 | #include <nvgpu/types.h> | 26 | #include <nvgpu/types.h> |
27 | 27 | ||
@@ -127,4 +127,4 @@ void nvgpu_rbtree_enum_start(u64 key_start, | |||
127 | void nvgpu_rbtree_enum_next(struct nvgpu_rbtree_node **node, | 127 | void nvgpu_rbtree_enum_next(struct nvgpu_rbtree_node **node, |
128 | struct nvgpu_rbtree_node *root); | 128 | struct nvgpu_rbtree_node *root); |
129 | 129 | ||
130 | #endif /* __NVGPU_RBTREE_H__ */ | 130 | #endif /* NVGPU_RBTREE_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/rwsem.h b/drivers/gpu/nvgpu/include/nvgpu/rwsem.h index 4facf138..3cca9c57 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/rwsem.h +++ b/drivers/gpu/nvgpu/include/nvgpu/rwsem.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -19,8 +19,8 @@ | |||
19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | #ifndef __NVGPU_RWSEM_H__ | 22 | #ifndef NVGPU_RWSEM_H |
23 | #define __NVGPU_RWSEM_H__ | 23 | #define NVGPU_RWSEM_H |
24 | 24 | ||
25 | #ifdef __KERNEL__ | 25 | #ifdef __KERNEL__ |
26 | #include <nvgpu/linux/rwsem.h> | 26 | #include <nvgpu/linux/rwsem.h> |
@@ -45,4 +45,4 @@ void nvgpu_rwsem_down_read(struct nvgpu_rwsem *rwsem); | |||
45 | void nvgpu_rwsem_up_write(struct nvgpu_rwsem *rwsem); | 45 | void nvgpu_rwsem_up_write(struct nvgpu_rwsem *rwsem); |
46 | void nvgpu_rwsem_down_write(struct nvgpu_rwsem *rwsem); | 46 | void nvgpu_rwsem_down_write(struct nvgpu_rwsem *rwsem); |
47 | 47 | ||
48 | #endif | 48 | #endif /* NVGPU_RWSEM_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/sim.h b/drivers/gpu/nvgpu/include/nvgpu/sim.h index 41cee8d0..1d6b15dd 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/sim.h +++ b/drivers/gpu/nvgpu/include/nvgpu/sim.h | |||
@@ -19,8 +19,8 @@ | |||
19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | #ifndef __NVGPU_SIM_H__ | 22 | #ifndef NVGPU_SIM_H |
23 | #define __NVGPU_SIM_H__ | 23 | #define NVGPU_SIM_H |
24 | 24 | ||
25 | #include <nvgpu/nvgpu_mem.h> | 25 | #include <nvgpu/nvgpu_mem.h> |
26 | 26 | ||
@@ -55,4 +55,4 @@ void nvgpu_free_sim_buffer(struct gk20a *g, struct nvgpu_mem *mem); | |||
55 | void nvgpu_free_sim_support(struct gk20a *g); | 55 | void nvgpu_free_sim_support(struct gk20a *g); |
56 | void nvgpu_remove_sim_support(struct gk20a *g); | 56 | void nvgpu_remove_sim_support(struct gk20a *g); |
57 | 57 | ||
58 | #endif | 58 | #endif /* NVGPU_SIM_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/sizes.h b/drivers/gpu/nvgpu/include/nvgpu/sizes.h index 588e772d..af5e4b27 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/sizes.h +++ b/drivers/gpu/nvgpu/include/nvgpu/sizes.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -19,8 +19,8 @@ | |||
19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | #ifndef __NVGPU_SIZES_H__ | 22 | #ifndef NVGPU_SIZES_H |
23 | #define __NVGPU_SIZES_H__ | 23 | #define NVGPU_SIZES_H |
24 | 24 | ||
25 | #ifdef __KERNEL__ | 25 | #ifdef __KERNEL__ |
26 | #include <linux/sizes.h> | 26 | #include <linux/sizes.h> |
@@ -30,4 +30,4 @@ | |||
30 | #include <nvgpu_rmos/include/sizes.h> | 30 | #include <nvgpu_rmos/include/sizes.h> |
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | #endif | 33 | #endif /* NVGPU_SIZES_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/thread.h b/drivers/gpu/nvgpu/include/nvgpu/thread.h index 316ca146..b113f972 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/thread.h +++ b/drivers/gpu/nvgpu/include/nvgpu/thread.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef __NVGPU_THREAD_H__ | 23 | #ifndef NVGPU_THREAD_H |
24 | #define __NVGPU_THREAD_H__ | 24 | #define NVGPU_THREAD_H |
25 | 25 | ||
26 | #ifdef __KERNEL__ | 26 | #ifdef __KERNEL__ |
27 | #include <nvgpu/linux/thread.h> | 27 | #include <nvgpu/linux/thread.h> |
@@ -80,4 +80,4 @@ bool nvgpu_thread_should_stop(struct nvgpu_thread *thread); | |||
80 | */ | 80 | */ |
81 | bool nvgpu_thread_is_running(struct nvgpu_thread *thread); | 81 | bool nvgpu_thread_is_running(struct nvgpu_thread *thread); |
82 | 82 | ||
83 | #endif /* __NVGPU_THREAD_H__ */ | 83 | #endif /* NVGPU_THREAD_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/timers.h b/drivers/gpu/nvgpu/include/nvgpu/timers.h index 20becfdd..f69e2349 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/timers.h +++ b/drivers/gpu/nvgpu/include/nvgpu/timers.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef __NVGPU_TIMERS_H__ | 23 | #ifndef NVGPU_TIMERS_H |
24 | #define __NVGPU_TIMERS_H__ | 24 | #define NVGPU_TIMERS_H |
25 | 25 | ||
26 | #include <nvgpu/types.h> | 26 | #include <nvgpu/types.h> |
27 | #include <nvgpu/utils.h> | 27 | #include <nvgpu/utils.h> |
@@ -113,4 +113,4 @@ s64 nvgpu_current_time_ms(void); | |||
113 | s64 nvgpu_current_time_ns(void); | 113 | s64 nvgpu_current_time_ns(void); |
114 | u64 nvgpu_hr_timestamp(void); | 114 | u64 nvgpu_hr_timestamp(void); |
115 | 115 | ||
116 | #endif | 116 | #endif /* NVGPU_TIMERS_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/types.h b/drivers/gpu/nvgpu/include/nvgpu/types.h index d4d88d4d..3295af26 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/types.h +++ b/drivers/gpu/nvgpu/include/nvgpu/types.h | |||
@@ -19,8 +19,8 @@ | |||
19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | #ifndef __NVGPU_TYPES_H__ | 22 | #ifndef NVGPU_TYPES_H |
23 | #define __NVGPU_TYPES_H__ | 23 | #define NVGPU_TYPES_H |
24 | 24 | ||
25 | #ifdef __KERNEL__ | 25 | #ifdef __KERNEL__ |
26 | #include <linux/types.h> | 26 | #include <linux/types.h> |
@@ -67,4 +67,4 @@ | |||
67 | #define U8_MAX ((u8)255) | 67 | #define U8_MAX ((u8)255) |
68 | #endif | 68 | #endif |
69 | 69 | ||
70 | #endif | 70 | #endif /* NVGPU_TYPES_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/vm.h b/drivers/gpu/nvgpu/include/nvgpu/vm.h index 23dac0ac..66749717 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/vm.h +++ b/drivers/gpu/nvgpu/include/nvgpu/vm.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef __NVGPU_VM_H__ | 23 | #ifndef NVGPU_VM_H |
24 | #define __NVGPU_VM_H__ | 24 | #define NVGPU_VM_H |
25 | 25 | ||
26 | #include <nvgpu/kref.h> | 26 | #include <nvgpu/kref.h> |
27 | #include <nvgpu/list.h> | 27 | #include <nvgpu/list.h> |
@@ -326,4 +326,4 @@ u64 __nvgpu_vm_alloc_va(struct vm_gk20a *vm, u64 size, | |||
326 | int __nvgpu_vm_free_va(struct vm_gk20a *vm, u64 addr, | 326 | int __nvgpu_vm_free_va(struct vm_gk20a *vm, u64 addr, |
327 | u32 pgsz_idx); | 327 | u32 pgsz_idx); |
328 | 328 | ||
329 | #endif | 329 | #endif /* NVGPU_VM_H */ |