diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobj.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobjgrp.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobjgrpmask.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/lpwr/lpwr.h | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/lpwr/rppg.h | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/perf/perf.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/perf/vfe_equ.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/perf/vfe_var.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pstate/pstate.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/therm/thrm.h | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/therm/thrmchannel.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/therm/thrmdev.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/therm/thrmpmu.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/volt/volt.h | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/volt/volt_dev.h | 7 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/volt/volt_pmu.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/volt/volt_policy.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/volt/volt_rail.h | 6 |
20 files changed, 64 insertions, 65 deletions
diff --git a/drivers/gpu/nvgpu/boardobj/boardobj.h b/drivers/gpu/nvgpu/boardobj/boardobj.h index b2ab990c..b1be9bd58 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobj.h +++ b/drivers/gpu/nvgpu/boardobj/boardobj.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef _BOARDOBJ_H_ | 23 | #ifndef NVGPU_BOARDOBJ_H |
24 | #define _BOARDOBJ_H_ | 24 | #define NVGPU_BOARDOBJ_H |
25 | 25 | ||
26 | #include <nvgpu/list.h> | 26 | #include <nvgpu/list.h> |
27 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 27 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
@@ -101,4 +101,4 @@ boardobj_from_node(struct nvgpu_list_node *node) | |||
101 | ((uintptr_t)node - offsetof(struct boardobj, node)); | 101 | ((uintptr_t)node - offsetof(struct boardobj, node)); |
102 | }; | 102 | }; |
103 | 103 | ||
104 | #endif | 104 | #endif /* NVGPU_BOARDOBJ_H */ |
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp.h b/drivers/gpu/nvgpu/boardobj/boardobjgrp.h index 095ff4c9..e9df445f 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp.h +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef _BOARDOBJGRP_H_ | 23 | #ifndef NVGPU_BOARDOBJGRP_H |
24 | #define _BOARDOBJGRP_H_ | 24 | #define NVGPU_BOARDOBJGRP_H |
25 | 25 | ||
26 | struct boardobjgrp; | 26 | struct boardobjgrp; |
27 | struct gk20a; | 27 | struct gk20a; |
@@ -438,4 +438,4 @@ int is_boardobjgrp_pmucmd_id_valid_v0(struct gk20a *g, | |||
438 | int is_boardobjgrp_pmucmd_id_valid_v1(struct gk20a *g, | 438 | int is_boardobjgrp_pmucmd_id_valid_v1(struct gk20a *g, |
439 | struct boardobjgrp *pboardobjgrp, | 439 | struct boardobjgrp *pboardobjgrp, |
440 | struct boardobjgrp_pmu_cmd *cmd); | 440 | struct boardobjgrp_pmu_cmd *cmd); |
441 | #endif | 441 | #endif /* NVGPU_BOARDOBJGRP_H */ |
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h index 10cd95c6..bc405419 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef _BOARDOBJGRP_E255_H_ | 23 | #ifndef NVGPU_BOARDOBJGRP_E255_H |
24 | #define _BOARDOBJGRP_E255_H_ | 24 | #define NVGPU_BOARDOBJGRP_E255_H |
25 | 25 | ||
26 | #include "ctrl/ctrlboardobj.h" | 26 | #include "ctrl/ctrlboardobj.h" |
27 | #include "boardobj.h" | 27 | #include "boardobj.h" |
@@ -48,4 +48,4 @@ int boardobjgrpconstruct_e255(struct gk20a *g, | |||
48 | boardobjgrp_destruct boardobjgrpdestruct_e255; | 48 | boardobjgrp_destruct boardobjgrpdestruct_e255; |
49 | boardobjgrp_pmuhdrdatainit boardobjgrp_pmuhdrdatainit_e255; | 49 | boardobjgrp_pmuhdrdatainit boardobjgrp_pmuhdrdatainit_e255; |
50 | 50 | ||
51 | #endif | 51 | #endif /* NVGPU_BOARDOBJGRP_E255_H */ |
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h index 900901bb..d4beb47e 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef _BOARDOBJGRP_E32_H_ | 23 | #ifndef NVGPU_BOARDOBJGRP_E32_H |
24 | #define _BOARDOBJGRP_E32_H_ | 24 | #define NVGPU_BOARDOBJGRP_E32_H |
25 | 25 | ||
26 | #include "ctrl/ctrlboardobj.h" | 26 | #include "ctrl/ctrlboardobj.h" |
27 | #include "boardobj.h" | 27 | #include "boardobj.h" |
@@ -63,4 +63,4 @@ int boardobjgrpconstruct_e32(struct gk20a *g, | |||
63 | boardobjgrp_destruct boardobjgrpdestruct_e32; | 63 | boardobjgrp_destruct boardobjgrpdestruct_e32; |
64 | boardobjgrp_pmuhdrdatainit boardobjgrp_pmuhdrdatainit_e32; | 64 | boardobjgrp_pmuhdrdatainit boardobjgrp_pmuhdrdatainit_e32; |
65 | 65 | ||
66 | #endif | 66 | #endif /* NVGPU_BOARDOBJGRP_E32_H */ |
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.h b/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.h index c081284a..f4ed0af4 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.h +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef _BOARDOBJGRPMASK_H_ | 23 | #ifndef NVGPU_BOARDOBJGRPMASK_H |
24 | #define _BOARDOBJGRPMASK_H_ | 24 | #define NVGPU_BOARDOBJGRPMASK_H |
25 | 25 | ||
26 | #include "ctrl/ctrlboardobj.h" | 26 | #include "ctrl/ctrlboardobj.h" |
27 | 27 | ||
@@ -116,4 +116,4 @@ bool boardobjgrpmask_issubset(struct boardobjgrpmask *op1, | |||
116 | boardobjgrpmask_init(&(pmaske255)->super, \ | 116 | boardobjgrpmask_init(&(pmaske255)->super, \ |
117 | CTRL_BOARDOBJGRP_E255_MAX_OBJECTS, (pextmask)) | 117 | CTRL_BOARDOBJGRP_E255_MAX_OBJECTS, (pextmask)) |
118 | 118 | ||
119 | #endif | 119 | #endif /* NVGPU_BOARDOBJGRPMASK_H */ |
diff --git a/drivers/gpu/nvgpu/lpwr/lpwr.h b/drivers/gpu/nvgpu/lpwr/lpwr.h index 98b9769e..c38ba629 100644 --- a/drivers/gpu/nvgpu/lpwr/lpwr.h +++ b/drivers/gpu/nvgpu/lpwr/lpwr.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016, 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"), |
@@ -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 _MSCG_H_ | 22 | #ifndef NVGPU_LPWR_H |
23 | #define _MSCG_H_ | 23 | #define NVGPU_LPWR_H |
24 | 24 | ||
25 | #define MAX_SWASR_MCLK_FREQ_WITHOUT_WR_TRAINING_MAXWELL_MHZ 540 | 25 | #define MAX_SWASR_MCLK_FREQ_WITHOUT_WR_TRAINING_MAXWELL_MHZ 540 |
26 | 26 | ||
@@ -98,4 +98,4 @@ u32 nvgpu_lpwr_is_mscg_supported(struct gk20a *g, u32 pstate_num); | |||
98 | u32 nvgpu_lpwr_is_rppg_supported(struct gk20a *g, u32 pstate_num); | 98 | u32 nvgpu_lpwr_is_rppg_supported(struct gk20a *g, u32 pstate_num); |
99 | u32 nvgpu_lpwr_post_init(struct gk20a *g); | 99 | u32 nvgpu_lpwr_post_init(struct gk20a *g); |
100 | 100 | ||
101 | #endif | 101 | #endif /* NVGPU_LPWR_H */ |
diff --git a/drivers/gpu/nvgpu/lpwr/rppg.h b/drivers/gpu/nvgpu/lpwr/rppg.h index a9966cbf..d66600a0 100644 --- a/drivers/gpu/nvgpu/lpwr/rppg.h +++ b/drivers/gpu/nvgpu/lpwr/rppg.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016, 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"), |
@@ -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 _RPPG_H_ | 22 | #ifndef NVGPU_LPWR_RPPG_H |
23 | #define _RPPG_H_ | 23 | #define NVGPU_LPWR_RPPG_H |
24 | 24 | ||
25 | u32 init_rppg(struct gk20a *g); | 25 | u32 init_rppg(struct gk20a *g); |
26 | #endif | 26 | #endif /* NVGPU_LPWR_RPPG_H */ |
diff --git a/drivers/gpu/nvgpu/perf/perf.h b/drivers/gpu/nvgpu/perf/perf.h index 17a9b0e1..71c8086b 100644 --- a/drivers/gpu/nvgpu/perf/perf.h +++ b/drivers/gpu/nvgpu/perf/perf.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 _PERF_H_ | 22 | #ifndef NVGPU_PERF_H |
23 | #define _PERF_H_ | 23 | #define NVGPU_PERF_H |
24 | 24 | ||
25 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 25 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
26 | #include "vfe_equ.h" | 26 | #include "vfe_equ.h" |
@@ -82,4 +82,4 @@ struct perf_pmupstate { | |||
82 | 82 | ||
83 | u32 perf_pmu_vfe_load(struct gk20a *g); | 83 | u32 perf_pmu_vfe_load(struct gk20a *g); |
84 | 84 | ||
85 | #endif | 85 | #endif /* NVGPU_PERF_H */ |
diff --git a/drivers/gpu/nvgpu/perf/vfe_equ.h b/drivers/gpu/nvgpu/perf/vfe_equ.h index 486a48f8..98222ee5 100644 --- a/drivers/gpu/nvgpu/perf/vfe_equ.h +++ b/drivers/gpu/nvgpu/perf/vfe_equ.h | |||
@@ -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 _VFE_EQU_H_ | 24 | #ifndef NVGPU_PERF_VFE_EQU_H |
25 | #define _VFE_EQU_H_ | 25 | #define NVGPU_PERF_VFE_EQU_H |
26 | 26 | ||
27 | #include "boardobj/boardobjgrp.h" | 27 | #include "boardobj/boardobjgrp.h" |
28 | #include "perf/vfe_var.h" | 28 | #include "perf/vfe_var.h" |
@@ -81,4 +81,4 @@ struct vfe_equ_quadratic { | |||
81 | u32 coeffs[CTRL_PERF_VFE_EQU_QUADRATIC_COEFF_COUNT]; | 81 | u32 coeffs[CTRL_PERF_VFE_EQU_QUADRATIC_COEFF_COUNT]; |
82 | }; | 82 | }; |
83 | 83 | ||
84 | #endif | 84 | #endif /* NVGPU_PERF_VFE_EQU_H */ |
diff --git a/drivers/gpu/nvgpu/perf/vfe_var.h b/drivers/gpu/nvgpu/perf/vfe_var.h index 535600a7..98b7c40b 100644 --- a/drivers/gpu/nvgpu/perf/vfe_var.h +++ b/drivers/gpu/nvgpu/perf/vfe_var.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef _VFE_VAR_H_ | 23 | #ifndef NVGPU_PERF_VFE_VAR_H |
24 | #define _VFE_VAR_H_ | 24 | #define NVGPU_PERF_VFE_VAR_H |
25 | 25 | ||
26 | #include "boardobj/boardobjgrp.h" | 26 | #include "boardobj/boardobjgrp.h" |
27 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 27 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
@@ -106,4 +106,4 @@ struct vfe_var_single_sensed_temp { | |||
106 | int temp_default; | 106 | int temp_default; |
107 | }; | 107 | }; |
108 | 108 | ||
109 | #endif | 109 | #endif /* NVGPU_PERF_VFE_VAR_H */ |
diff --git a/drivers/gpu/nvgpu/pstate/pstate.h b/drivers/gpu/nvgpu/pstate/pstate.h index 0860b46e..42b27eab 100644 --- a/drivers/gpu/nvgpu/pstate/pstate.h +++ b/drivers/gpu/nvgpu/pstate/pstate.h | |||
@@ -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 __PSTATE_H__ | 24 | #ifndef NVGPU_PSTATE_H |
25 | #define __PSTATE_H__ | 25 | #define NVGPU_PSTATE_H |
26 | 26 | ||
27 | #include "clk/clk.h" | 27 | #include "clk/clk.h" |
28 | 28 | ||
@@ -71,4 +71,4 @@ struct clk_set_info *pstate_get_clk_set_info(struct gk20a *g, u32 pstate_num, | |||
71 | enum nv_pmu_clk_clkwhich clkwhich); | 71 | enum nv_pmu_clk_clkwhich clkwhich); |
72 | struct pstate *pstate_find(struct gk20a *g, u32 num); | 72 | struct pstate *pstate_find(struct gk20a *g, u32 num); |
73 | 73 | ||
74 | #endif /* __PSTATE_H__ */ | 74 | #endif /* NVGPU_PSTATE_H */ |
diff --git a/drivers/gpu/nvgpu/therm/thrm.h b/drivers/gpu/nvgpu/therm/thrm.h index 5b5a5a57..d9d73b7f 100644 --- a/drivers/gpu/nvgpu/therm/thrm.h +++ b/drivers/gpu/nvgpu/therm/thrm.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * general thermal table structures & definitions | 2 | * general thermal table structures & definitions |
3 | * | 3 | * |
4 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2016-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 _THRM_H_ | 24 | #ifndef NVGPU_THERM_THRM_H |
25 | #define _THRM_H_ | 25 | #define NVGPU_THERM_THRM_H |
26 | 26 | ||
27 | #include "thrmdev.h" | 27 | #include "thrmdev.h" |
28 | #include "thrmchannel.h" | 28 | #include "thrmchannel.h" |
@@ -35,4 +35,4 @@ struct therm_pmupstate { | |||
35 | u32 therm_domain_sw_setup(struct gk20a *g); | 35 | u32 therm_domain_sw_setup(struct gk20a *g); |
36 | u32 therm_domain_pmu_setup(struct gk20a *g); | 36 | u32 therm_domain_pmu_setup(struct gk20a *g); |
37 | 37 | ||
38 | #endif | 38 | #endif /* NVGPU_THERM_THRM_H */ |
diff --git a/drivers/gpu/nvgpu/therm/thrmchannel.h b/drivers/gpu/nvgpu/therm/thrmchannel.h index a2045c26..89be673f 100644 --- a/drivers/gpu/nvgpu/therm/thrmchannel.h +++ b/drivers/gpu/nvgpu/therm/thrmchannel.h | |||
@@ -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 _THRMCHANNEL_H_ | 24 | #ifndef NVGPU_THERM_THRMCHANNEL_H |
25 | #define _THRMCHANNEL_H_ | 25 | #define NVGPU_THERM_THRMCHANNEL_H |
26 | 26 | ||
27 | #include "boardobj/boardobj.h" | 27 | #include "boardobj/boardobj.h" |
28 | #include "boardobj/boardobjgrp.h" | 28 | #include "boardobj/boardobjgrp.h" |
@@ -48,4 +48,4 @@ struct therm_channel_device { | |||
48 | 48 | ||
49 | int therm_channel_sw_setup(struct gk20a *g); | 49 | int therm_channel_sw_setup(struct gk20a *g); |
50 | 50 | ||
51 | #endif | 51 | #endif /* NVGPU_THERM_THRMCHANNEL_H */ |
diff --git a/drivers/gpu/nvgpu/therm/thrmdev.h b/drivers/gpu/nvgpu/therm/thrmdev.h index df4c199a..151e96fb 100644 --- a/drivers/gpu/nvgpu/therm/thrmdev.h +++ b/drivers/gpu/nvgpu/therm/thrmdev.h | |||
@@ -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 _THRMDEV_H_ | 24 | #ifndef NVGPU_THERM_THRMDEV_H |
25 | #define _THRMDEV_H_ | 25 | #define NVGPU_THERM_THRMDEV_H |
26 | 26 | ||
27 | #include "boardobj/boardobj.h" | 27 | #include "boardobj/boardobj.h" |
28 | #include "boardobj/boardobjgrp.h" | 28 | #include "boardobj/boardobjgrp.h" |
@@ -55,4 +55,4 @@ struct therm_device_hbm2_combined { | |||
55 | 55 | ||
56 | int therm_device_sw_setup(struct gk20a *g); | 56 | int therm_device_sw_setup(struct gk20a *g); |
57 | 57 | ||
58 | #endif | 58 | #endif /* NVGPU_THERM_THRMDEV_H */ |
diff --git a/drivers/gpu/nvgpu/therm/thrmpmu.h b/drivers/gpu/nvgpu/therm/thrmpmu.h index 1341a055..42d5caae 100644 --- a/drivers/gpu/nvgpu/therm/thrmpmu.h +++ b/drivers/gpu/nvgpu/therm/thrmpmu.h | |||
@@ -21,11 +21,11 @@ | |||
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 _THRMPMU_H_ | 24 | #ifndef NVGPU_THERM_THRMPMU_H |
25 | #define _THRMPMU_H_ | 25 | #define NVGPU_THERM_THRMPMU_H |
26 | 26 | ||
27 | int therm_send_pmgr_tables_to_pmu(struct gk20a *g); | 27 | int therm_send_pmgr_tables_to_pmu(struct gk20a *g); |
28 | 28 | ||
29 | u32 therm_configure_therm_alert(struct gk20a *g); | 29 | u32 therm_configure_therm_alert(struct gk20a *g); |
30 | 30 | ||
31 | #endif | 31 | #endif /* NVGPU_THERM_THRMPMU_H */ |
diff --git a/drivers/gpu/nvgpu/volt/volt.h b/drivers/gpu/nvgpu/volt/volt.h index 482172bf..8b4895f9 100644 --- a/drivers/gpu/nvgpu/volt/volt.h +++ b/drivers/gpu/nvgpu/volt/volt.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016, 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 _VOLT_H_ | 23 | #ifndef NVGPU_VOLT_H |
24 | #define _VOLT_H_ | 24 | #define NVGPU_VOLT_H |
25 | 25 | ||
26 | #include "volt_rail.h" | 26 | #include "volt_rail.h" |
27 | #include "volt_dev.h" | 27 | #include "volt_dev.h" |
@@ -36,4 +36,4 @@ struct obj_volt { | |||
36 | struct voltage_policy_metadata volt_policy_metadata; | 36 | struct voltage_policy_metadata volt_policy_metadata; |
37 | }; | 37 | }; |
38 | 38 | ||
39 | #endif /* DRIVERS_GPU_NVGPU_VOLT_VOLT_H_ */ | 39 | #endif /* NVGPU_VOLT_H */ |
diff --git a/drivers/gpu/nvgpu/volt/volt_dev.h b/drivers/gpu/nvgpu/volt/volt_dev.h index 98f3bce9..eb1868cb 100644 --- a/drivers/gpu/nvgpu/volt/volt_dev.h +++ b/drivers/gpu/nvgpu/volt/volt_dev.h | |||
@@ -20,9 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | 23 | #ifndef NVGPU_VOLT_DEV_H | |
24 | #ifndef _VOLTDEV_H_ | 24 | #define NVGPU_VOLT_DEV_H |
25 | #define _VOLTDEV_H_ | ||
26 | 25 | ||
27 | #include "boardobj/boardobj.h" | 26 | #include "boardobj/boardobj.h" |
28 | #include "boardobj/boardobjgrp.h" | 27 | #include "boardobj/boardobjgrp.h" |
@@ -75,4 +74,4 @@ struct voltage_device_pwm_entry { | |||
75 | u32 volt_dev_sw_setup(struct gk20a *g); | 74 | u32 volt_dev_sw_setup(struct gk20a *g); |
76 | int volt_dev_pmu_setup(struct gk20a *g); | 75 | int volt_dev_pmu_setup(struct gk20a *g); |
77 | 76 | ||
78 | #endif /* _VOLTDEV_H_ */ | 77 | #endif /* NVGPU_VOLT_DEV_H */ |
diff --git a/drivers/gpu/nvgpu/volt/volt_pmu.h b/drivers/gpu/nvgpu/volt/volt_pmu.h index fbdf7c1e..c9fb8bfc 100644 --- a/drivers/gpu/nvgpu/volt/volt_pmu.h +++ b/drivers/gpu/nvgpu/volt/volt_pmu.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef _VOLT_PMU_H_ | 23 | #ifndef NVGPU_VOLT_PMU_H |
24 | #define _VOLT_PMU_H_ | 24 | #define NVGPU_VOLT_PMU_H |
25 | 25 | ||
26 | u32 volt_pmu_send_load_cmd_to_pmu(struct gk20a *g); | 26 | u32 volt_pmu_send_load_cmd_to_pmu(struct gk20a *g); |
27 | u32 volt_set_voltage(struct gk20a *g, u32 logic_voltage_uv, | 27 | u32 volt_set_voltage(struct gk20a *g, u32 logic_voltage_uv, |
@@ -43,4 +43,4 @@ u32 nvgpu_volt_rail_get_voltage_gv10x(struct gk20a *g, | |||
43 | u32 nvgpu_volt_send_load_cmd_to_pmu_gv10x(struct gk20a *g); | 43 | u32 nvgpu_volt_send_load_cmd_to_pmu_gv10x(struct gk20a *g); |
44 | 44 | ||
45 | 45 | ||
46 | #endif | 46 | #endif /* NVGPU_VOLT_PMU_H */ |
diff --git a/drivers/gpu/nvgpu/volt/volt_policy.h b/drivers/gpu/nvgpu/volt/volt_policy.h index af13e02f..06f5aa3b 100644 --- a/drivers/gpu/nvgpu/volt/volt_policy.h +++ b/drivers/gpu/nvgpu/volt/volt_policy.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef _VOLT_POLICY_H_ | 23 | #ifndef NVGPU_VOLT_POLICY_H |
24 | #define _VOLT_POLICY_H_ | 24 | #define NVGPU_VOLT_POLICY_H |
25 | 25 | ||
26 | #define VOLT_POLICY_INDEX_IS_VALID(pvolt, policy_idx) \ | 26 | #define VOLT_POLICY_INDEX_IS_VALID(pvolt, policy_idx) \ |
27 | (boardobjgrp_idxisvalid( \ | 27 | (boardobjgrp_idxisvalid( \ |
@@ -77,4 +77,4 @@ struct voltage_policy_single_rail_multi_step { | |||
77 | 77 | ||
78 | int volt_policy_sw_setup(struct gk20a *g); | 78 | int volt_policy_sw_setup(struct gk20a *g); |
79 | int volt_policy_pmu_setup(struct gk20a *g); | 79 | int volt_policy_pmu_setup(struct gk20a *g); |
80 | #endif | 80 | #endif /* NVGPU_VOLT_POLICY_H */ |
diff --git a/drivers/gpu/nvgpu/volt/volt_rail.h b/drivers/gpu/nvgpu/volt/volt_rail.h index 6c667eed..522d635a 100644 --- a/drivers/gpu/nvgpu/volt/volt_rail.h +++ b/drivers/gpu/nvgpu/volt/volt_rail.h | |||
@@ -21,8 +21,8 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | 23 | ||
24 | #ifndef _VOLT_RAIL_H_ | 24 | #ifndef NVGPU_VOLT_RAIL_H |
25 | #define _VOLT_RAIL_H_ | 25 | #define NVGPU_VOLT_RAIL_H |
26 | 26 | ||
27 | #include "boardobj/boardobj.h" | 27 | #include "boardobj/boardobj.h" |
28 | #include "boardobj/boardobjgrp.h" | 28 | #include "boardobj/boardobjgrp.h" |
@@ -87,4 +87,4 @@ u8 volt_rail_volt_domain_convert_to_idx(struct gk20a *g, u8 volt_domain); | |||
87 | 87 | ||
88 | int volt_rail_sw_setup(struct gk20a *g); | 88 | int volt_rail_sw_setup(struct gk20a *g); |
89 | int volt_rail_pmu_setup(struct gk20a *g); | 89 | int volt_rail_pmu_setup(struct gk20a *g); |
90 | #endif | 90 | #endif /* NVGPU_VOLT_RAIL_H */ |