diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/acr/acr_flcnbl.h | 10 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/acr/acr_lsfm.h | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/acr/acr_objflcn.h | 10 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/acr/acr_objlsfm.h | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/acr/nvgpu_acr.h | 7 |
5 files changed, 22 insertions, 21 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/acr/acr_flcnbl.h b/drivers/gpu/nvgpu/include/nvgpu/acr/acr_flcnbl.h index 52dc3f24..ad697b2b 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/acr/acr_flcnbl.h +++ b/drivers/gpu/nvgpu/include/nvgpu/acr/acr_flcnbl.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,12 +19,12 @@ | |||
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 __ACR_FLCNBL_H__ | 22 | #ifndef NVGPU_ACR_FLCNBL_H |
23 | #define __ACR_FLCNBL_H__ | 23 | #define NVGPU_ACR_FLCNBL_H |
24 | 24 | ||
25 | #include <nvgpu/flcnif_cmn.h> | 25 | #include <nvgpu/flcnif_cmn.h> |
26 | 26 | ||
27 | #ifndef __NVGPU_ACR_H__ | 27 | #ifndef NVGPU_ACR_H |
28 | #warning "acr_flcnbl.h not included from nvgpu_acr.h!" \ | 28 | #warning "acr_flcnbl.h not included from nvgpu_acr.h!" \ |
29 | "Include nvgpu_acr.h instead of acr_xxx.h to get access to ACR interfaces" | 29 | "Include nvgpu_acr.h instead of acr_xxx.h to get access to ACR interfaces" |
30 | #endif | 30 | #endif |
@@ -141,4 +141,4 @@ union flcn_bl_generic_desc_v1 { | |||
141 | struct loader_config_v1 loader_cfg_v1; | 141 | struct loader_config_v1 loader_cfg_v1; |
142 | }; | 142 | }; |
143 | 143 | ||
144 | #endif /* __ACR_FLCNBL_H__ */ | 144 | #endif /* NVGPU_ACR_FLCNBL_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/acr/acr_lsfm.h b/drivers/gpu/nvgpu/include/nvgpu/acr/acr_lsfm.h index f9d9e2a8..ed585527 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/acr/acr_lsfm.h +++ b/drivers/gpu/nvgpu/include/nvgpu/acr/acr_lsfm.h | |||
@@ -19,10 +19,10 @@ | |||
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 __ACR_LSFM_H__ | 22 | #ifndef NVGPU_ACR_LSFM_H |
23 | #define __ACR_LSFM_H__ | 23 | #define NVGPU_ACR_LSFM_H |
24 | 24 | ||
25 | #ifndef __NVGPU_ACR_H__ | 25 | #ifndef NVGPU_ACR_H |
26 | #warning "acr_lsfm.h not included from nvgpu_acr.h!" \ | 26 | #warning "acr_lsfm.h not included from nvgpu_acr.h!" \ |
27 | "Include nvgpu_acr.h instead of acr_xxx.h to get access to ACR interfaces" | 27 | "Include nvgpu_acr.h instead of acr_xxx.h to get access to ACR interfaces" |
28 | #endif | 28 | #endif |
@@ -325,4 +325,4 @@ struct flcn_acr_desc_v1 { | |||
325 | }; | 325 | }; |
326 | 326 | ||
327 | 327 | ||
328 | #endif /* __ACR_LSFM_H__ */ | 328 | #endif /* NVGPU_ACR_LSFM_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/acr/acr_objflcn.h b/drivers/gpu/nvgpu/include/nvgpu/acr/acr_objflcn.h index 951eb3c6..57b43c8a 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/acr/acr_objflcn.h +++ b/drivers/gpu/nvgpu/include/nvgpu/acr/acr_objflcn.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,10 +19,10 @@ | |||
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 __ACR_OBJFLCN_H__ | 22 | #ifndef NVGPU_ACR_OBJFLCN_H |
23 | #define __ACR_OBJFLCN_H__ | 23 | #define NVGPU_ACR_OBJFLCN_H |
24 | 24 | ||
25 | #ifndef __NVGPU_ACR_H__ | 25 | #ifndef NVGPU_ACR_H |
26 | #warning "acr_objflcn.h not included from nvgpu_acr.h!" \ | 26 | #warning "acr_objflcn.h not included from nvgpu_acr.h!" \ |
27 | "Include nvgpu_acr.h instead of acr_xxx.h to get access to ACR interfaces" | 27 | "Include nvgpu_acr.h instead of acr_xxx.h to get access to ACR interfaces" |
28 | #endif | 28 | #endif |
@@ -88,4 +88,4 @@ struct flcn_ucode_img_v1 { | |||
88 | #define FLCN_NL_UCODE_HDR_OS_OVL_SIZE_IND(N) \ | 88 | #define FLCN_NL_UCODE_HDR_OS_OVL_SIZE_IND(N) \ |
89 | (FLCN_NL_UCODE_HDR_APP_DATA_END_IND(N) + 2) | 89 | (FLCN_NL_UCODE_HDR_APP_DATA_END_IND(N) + 2) |
90 | 90 | ||
91 | #endif /* __ACR_OBJFLCN_H__ */ | 91 | #endif /* NVGPU_ACR_OBJFLCN_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/acr/acr_objlsfm.h b/drivers/gpu/nvgpu/include/nvgpu/acr/acr_objlsfm.h index 96fb9f19..e3769bb7 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/acr/acr_objlsfm.h +++ b/drivers/gpu/nvgpu/include/nvgpu/acr/acr_objlsfm.h | |||
@@ -19,10 +19,10 @@ | |||
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 __ACR_OBJLSFM_H__ | 22 | #ifndef NVGPU_ACR_OBJLSFM_H |
23 | #define __ACR_OBJLSFM_H__ | 23 | #define NVGPU_ACR_OBJLSFM_H |
24 | 24 | ||
25 | #ifndef __NVGPU_ACR_H__ | 25 | #ifndef NVGPU_ACR_H |
26 | #warning "acr_objlsfm.h not included from nvgpu_acr.h!" \ | 26 | #warning "acr_objlsfm.h not included from nvgpu_acr.h!" \ |
27 | "Include nvgpu_acr.h instead of acr_xxx.h to get access to ACR interfaces" | 27 | "Include nvgpu_acr.h instead of acr_xxx.h to get access to ACR interfaces" |
28 | #endif | 28 | #endif |
@@ -94,4 +94,4 @@ struct ls_flcn_mgr_v1 { | |||
94 | }; | 94 | }; |
95 | 95 | ||
96 | 96 | ||
97 | #endif /* __ACR_OBJLSFM_H__ */ | 97 | #endif /* NVGPU_ACR_OBJLSFM_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/acr/nvgpu_acr.h b/drivers/gpu/nvgpu/include/nvgpu/acr/nvgpu_acr.h index ba658c95..7a0143e7 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/acr/nvgpu_acr.h +++ b/drivers/gpu/nvgpu/include/nvgpu/acr/nvgpu_acr.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef __NVGPU_ACR_H__ | 23 | #ifndef NVGPU_ACR_H |
24 | #define __NVGPU_ACR_H__ | 24 | #define NVGPU_ACR_H |
25 | 25 | ||
26 | #include <nvgpu/falcon.h> | 26 | #include <nvgpu/falcon.h> |
27 | 27 | ||
@@ -184,4 +184,5 @@ struct nvgpu_acr { | |||
184 | 184 | ||
185 | void (*remove_support)(struct nvgpu_acr *acr); | 185 | void (*remove_support)(struct nvgpu_acr *acr); |
186 | }; | 186 | }; |
187 | #endif /*__NVGPU_ACR_H__*/ | 187 | #endif /* NVGPU_ACR_H */ |
188 | |||