diff options
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ce2_gk20a.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fence_gk20a.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/flcn_gk20a.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.h | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/hal.h | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.h | 6 |
8 files changed, 26 insertions, 26 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.h b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.h index f46d0d9d..df3a0e84 100644 --- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.h | |||
@@ -23,8 +23,8 @@ | |||
23 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 23 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
24 | * DEALINGS IN THE SOFTWARE. | 24 | * DEALINGS IN THE SOFTWARE. |
25 | */ | 25 | */ |
26 | #ifndef __CE2_GK20A_H__ | 26 | #ifndef NVGPU_GK20A_CE2_GK20A_H |
27 | #define __CE2_GK20A_H__ | 27 | #define NVGPU_GK20A_CE2_GK20A_H |
28 | 28 | ||
29 | struct channel_gk20a; | 29 | struct channel_gk20a; |
30 | struct tsg_gk20a; | 30 | struct tsg_gk20a; |
@@ -153,4 +153,4 @@ int gk20a_ce_prepare_submit(u64 src_buf, | |||
153 | int request_operation, | 153 | int request_operation, |
154 | u32 dma_copy_class); | 154 | u32 dma_copy_class); |
155 | 155 | ||
156 | #endif /*__CE2_GK20A_H__*/ | 156 | #endif /*NVGPU_GK20A_CE2_GK20A_H*/ |
diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h index cb155d6d..e0e318d2 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h | |||
@@ -24,8 +24,8 @@ | |||
24 | * DEALINGS IN THE SOFTWARE. | 24 | * DEALINGS IN THE SOFTWARE. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #ifndef _GK20A_CHANNEL_SYNC_H_ | 27 | #ifndef NVGPU_GK20A_CHANNEL_SYNC_GK20A_H |
28 | #define _GK20A_CHANNEL_SYNC_H_ | 28 | #define NVGPU_GK20A_CHANNEL_SYNC_GK20A_H |
29 | 29 | ||
30 | struct gk20a_channel_sync; | 30 | struct gk20a_channel_sync; |
31 | struct priv_cmd_entry; | 31 | struct priv_cmd_entry; |
@@ -109,4 +109,4 @@ struct gk20a_channel_sync *gk20a_channel_sync_create(struct channel_gk20a *c, | |||
109 | bool user_managed); | 109 | bool user_managed); |
110 | bool gk20a_channel_sync_needs_sync_framework(struct gk20a *g); | 110 | bool gk20a_channel_sync_needs_sync_framework(struct gk20a *g); |
111 | 111 | ||
112 | #endif | 112 | #endif /* NVGPU_GK20A_CHANNEL_SYNC_GK20A_H */ |
diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.h b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.h index 8e723107..cbde2fe7 100644 --- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef __FECS_TRACE_GK20A_H | 23 | #ifndef NVGPU_GK20A_FECS_TRACE_GK20A_H |
24 | #define __FECS_TRACE_GK20A_H | 24 | #define NVGPU_GK20A_FECS_TRACE_GK20A_H |
25 | 25 | ||
26 | struct gk20a; | 26 | struct gk20a; |
27 | struct channel_gk20a; | 27 | struct channel_gk20a; |
@@ -41,4 +41,4 @@ int gk20a_fecs_trace_disable(struct gk20a *g); | |||
41 | bool gk20a_fecs_trace_is_enabled(struct gk20a *g); | 41 | bool gk20a_fecs_trace_is_enabled(struct gk20a *g); |
42 | size_t gk20a_fecs_trace_buffer_size(struct gk20a *g); | 42 | size_t gk20a_fecs_trace_buffer_size(struct gk20a *g); |
43 | 43 | ||
44 | #endif /* __FECS_TRACE_GK20A_H */ | 44 | #endif /* NVGPU_GK20A_FECS_TRACE_GK20A_H */ |
diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.h b/drivers/gpu/nvgpu/gk20a/fence_gk20a.h index 271b2a18..03112797 100644 --- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.h | |||
@@ -23,8 +23,8 @@ | |||
23 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 23 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
24 | * DEALINGS IN THE SOFTWARE. | 24 | * DEALINGS IN THE SOFTWARE. |
25 | */ | 25 | */ |
26 | #ifndef _GK20A_FENCE_H_ | 26 | #ifndef NVGPU_GK20A_FENCE_GK20A_H |
27 | #define _GK20A_FENCE_H_ | 27 | #define NVGPU_GK20A_FENCE_GK20A_H |
28 | 28 | ||
29 | #include <nvgpu/types.h> | 29 | #include <nvgpu/types.h> |
30 | #include <nvgpu/kref.h> | 30 | #include <nvgpu/kref.h> |
@@ -97,4 +97,4 @@ bool gk20a_fence_is_expired(struct gk20a_fence *f); | |||
97 | bool gk20a_fence_is_valid(struct gk20a_fence *f); | 97 | bool gk20a_fence_is_valid(struct gk20a_fence *f); |
98 | int gk20a_fence_install_fd(struct gk20a_fence *f, int fd); | 98 | int gk20a_fence_install_fd(struct gk20a_fence *f, int fd); |
99 | 99 | ||
100 | #endif | 100 | #endif /* NVGPU_GK20A_FENCE_GK20A_H */ |
diff --git a/drivers/gpu/nvgpu/gk20a/flcn_gk20a.h b/drivers/gpu/nvgpu/gk20a/flcn_gk20a.h index 7f7ee89e..9d27b383 100644 --- a/drivers/gpu/nvgpu/gk20a/flcn_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/flcn_gk20a.h | |||
@@ -19,11 +19,11 @@ | |||
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 __FLCN_GK20A_H__ | 22 | #ifndef NVGPU_GK20A_FLCN_GK20A_H |
23 | #define __FLCN_GK20A_H__ | 23 | #define NVGPU_GK20A_FLCN_GK20A_H |
24 | 24 | ||
25 | void gk20a_falcon_ops(struct nvgpu_falcon *flcn); | 25 | void gk20a_falcon_ops(struct nvgpu_falcon *flcn); |
26 | int gk20a_falcon_hal_sw_init(struct nvgpu_falcon *flcn); | 26 | int gk20a_falcon_hal_sw_init(struct nvgpu_falcon *flcn); |
27 | void gk20a_falcon_dump_stats(struct nvgpu_falcon *flcn); | 27 | void gk20a_falcon_dump_stats(struct nvgpu_falcon *flcn); |
28 | 28 | ||
29 | #endif /* __FLCN_GK20A_H__ */ | 29 | #endif /* NVGPU_GK20A_FLCN_GK20A_H */ |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.h index 10f8723f..e75472c5 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GK20A Graphics Context | 2 | * GK20A Graphics Context |
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"), |
@@ -21,8 +21,8 @@ | |||
21 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 21 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | #ifndef __GR_CTX_GK20A_H__ | 24 | #ifndef NVGPU_GK20A_GR_CTX_GK20A_H |
25 | #define __GR_CTX_GK20A_H__ | 25 | #define NVGPU_GK20A_GR_CTX_GK20A_H |
26 | 26 | ||
27 | #include <nvgpu/kmem.h> | 27 | #include <nvgpu/kmem.h> |
28 | 28 | ||
@@ -203,4 +203,4 @@ int gr_gk20a_init_ctx_vars_sim(struct gk20a *g, struct gr_gk20a *gr); | |||
203 | struct gpu_ops; | 203 | struct gpu_ops; |
204 | void gk20a_init_gr_ctx(struct gpu_ops *gops); | 204 | void gk20a_init_gr_ctx(struct gpu_ops *gops); |
205 | 205 | ||
206 | #endif /*__GR_CTX_GK20A_H__*/ | 206 | #endif /*NVGPU_GK20A_GR_CTX_GK20A_H*/ |
diff --git a/drivers/gpu/nvgpu/gk20a/hal.h b/drivers/gpu/nvgpu/gk20a/hal.h index b26b2ef5..0a6e7094 100644 --- a/drivers/gpu/nvgpu/gk20a/hal.h +++ b/drivers/gpu/nvgpu/gk20a/hal.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * NVIDIA GPU Hardware Abstraction Layer functions definitions. | 2 | * NVIDIA GPU Hardware Abstraction Layer functions definitions. |
3 | * | 3 | * |
4 | * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2014-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"), |
@@ -22,11 +22,11 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #ifndef __HAL_GPU__ | 25 | #ifndef NVGPU_GK20A_HAL_H |
26 | #define __HAL_GPU__ | 26 | #define NVGPU_GK20A_HAL_H |
27 | 27 | ||
28 | struct gk20a; | 28 | struct gk20a; |
29 | 29 | ||
30 | int gpu_init_hal(struct gk20a *g); | 30 | int gpu_init_hal(struct gk20a *g); |
31 | 31 | ||
32 | #endif /* __HAL_GPU__ */ | 32 | #endif /* NVGPU_GK20A_HAL_H */ |
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h index ee7ee8c7..700a3a0e 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h | |||
@@ -23,8 +23,8 @@ | |||
23 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 23 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
24 | * DEALINGS IN THE SOFTWARE. | 24 | * DEALINGS IN THE SOFTWARE. |
25 | */ | 25 | */ |
26 | #ifndef __PMU_GK20A_H__ | 26 | #ifndef NVGPU_GK20A_PMU_GK20A_H |
27 | #define __PMU_GK20A_H__ | 27 | #define NVGPU_GK20A_PMU_GK20A_H |
28 | 28 | ||
29 | #include <nvgpu/flcnif_cmn.h> | 29 | #include <nvgpu/flcnif_cmn.h> |
30 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 30 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
@@ -75,4 +75,4 @@ void gk20a_pmu_elpg_statistics(struct gk20a *g, u32 pg_engine_id, | |||
75 | bool gk20a_pmu_is_engine_in_reset(struct gk20a *g); | 75 | bool gk20a_pmu_is_engine_in_reset(struct gk20a *g); |
76 | int gk20a_pmu_engine_reset(struct gk20a *g, bool do_reset); | 76 | int gk20a_pmu_engine_reset(struct gk20a *g, bool do_reset); |
77 | u32 gk20a_pmu_get_irqdest(struct gk20a *g); | 77 | u32 gk20a_pmu_get_irqdest(struct gk20a *g); |
78 | #endif /*__PMU_GK20A_H__*/ | 78 | #endif /*NVGPU_GK20A_PMU_GK20A_H*/ |