diff options
author | Alex Waterman <alexw@nvidia.com> | 2018-05-24 15:39:06 -0400 |
---|---|---|
committer | Bo Yan <byan@nvidia.com> | 2018-05-24 16:50:35 -0400 |
commit | 775c69af8cffbd3c11cda027a99ad9d588e09f95 (patch) | |
tree | 3aebcf125c41c2c484589c19ff5bc3f50600f041 | |
parent | ffb5cd7fdd0ed2a969faed7dbb4eb4bc00a5819f (diff) |
gpu: nvgpu: Add types.h to clock gating headers
The headers use u32 and bool but do not include <nvgpu/types.h>.
Moving around header includes exposed this issue in the cascade
builds.
This patch fixes the problem in all clock gating headers to
avoid this being a concern in the future.
Change-Id: Id56074df393d95bf65baf4062ac811d80d87e96b
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1729748
Reviewed-by: Bo Yan <byan@nvidia.com>
6 files changed, 12 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/common/clock_gating/gating_reglist.h b/drivers/gpu/nvgpu/common/clock_gating/gating_reglist.h index 30638717..a0e92489 100644 --- a/drivers/gpu/nvgpu/common/clock_gating/gating_reglist.h +++ b/drivers/gpu/nvgpu/common/clock_gating/gating_reglist.h | |||
@@ -25,6 +25,8 @@ | |||
25 | #ifndef GATING_REGLIST_H | 25 | #ifndef GATING_REGLIST_H |
26 | #define GATING_REGLIST_H | 26 | #define GATING_REGLIST_H |
27 | 27 | ||
28 | #include <nvgpu/types.h> | ||
29 | |||
28 | struct gating_desc { | 30 | struct gating_desc { |
29 | u32 addr; | 31 | u32 addr; |
30 | u32 prod; | 32 | u32 prod; |
@@ -32,4 +34,3 @@ struct gating_desc { | |||
32 | }; | 34 | }; |
33 | 35 | ||
34 | #endif /* GATING_REGLIST_H */ | 36 | #endif /* GATING_REGLIST_H */ |
35 | |||
diff --git a/drivers/gpu/nvgpu/common/clock_gating/gm20b_gating_reglist.h b/drivers/gpu/nvgpu/common/clock_gating/gm20b_gating_reglist.h index 0c8c3b55..30ae41ff 100644 --- a/drivers/gpu/nvgpu/common/clock_gating/gm20b_gating_reglist.h +++ b/drivers/gpu/nvgpu/common/clock_gating/gm20b_gating_reglist.h | |||
@@ -23,6 +23,8 @@ | |||
23 | #ifndef GM20B_GATING_REGLIST_H | 23 | #ifndef GM20B_GATING_REGLIST_H |
24 | #define GM20B_GATING_REGLIST_H | 24 | #define GM20B_GATING_REGLIST_H |
25 | 25 | ||
26 | #include <nvgpu/types.h> | ||
27 | |||
26 | struct gk20a; | 28 | struct gk20a; |
27 | 29 | ||
28 | void gm20b_slcg_bus_load_gating_prod(struct gk20a *g, | 30 | void gm20b_slcg_bus_load_gating_prod(struct gk20a *g, |
diff --git a/drivers/gpu/nvgpu/common/clock_gating/gp106_gating_reglist.h b/drivers/gpu/nvgpu/common/clock_gating/gp106_gating_reglist.h index a29a2b91..09725480 100644 --- a/drivers/gpu/nvgpu/common/clock_gating/gp106_gating_reglist.h +++ b/drivers/gpu/nvgpu/common/clock_gating/gp106_gating_reglist.h | |||
@@ -23,6 +23,8 @@ | |||
23 | #ifndef GP106_GATING_REGLIST_H | 23 | #ifndef GP106_GATING_REGLIST_H |
24 | #define GP106_GATING_REGLIST_H | 24 | #define GP106_GATING_REGLIST_H |
25 | 25 | ||
26 | #include <nvgpu/types.h> | ||
27 | |||
26 | struct gk20a; | 28 | struct gk20a; |
27 | 29 | ||
28 | void gp106_slcg_bus_load_gating_prod(struct gk20a *g, | 30 | void gp106_slcg_bus_load_gating_prod(struct gk20a *g, |
diff --git a/drivers/gpu/nvgpu/common/clock_gating/gp10b_gating_reglist.h b/drivers/gpu/nvgpu/common/clock_gating/gp10b_gating_reglist.h index 2256ce4a..30ee149a 100644 --- a/drivers/gpu/nvgpu/common/clock_gating/gp10b_gating_reglist.h +++ b/drivers/gpu/nvgpu/common/clock_gating/gp10b_gating_reglist.h | |||
@@ -23,6 +23,8 @@ | |||
23 | #ifndef GP10B_GATING_REGLIST_H | 23 | #ifndef GP10B_GATING_REGLIST_H |
24 | #define GP10B_GATING_REGLIST_H | 24 | #define GP10B_GATING_REGLIST_H |
25 | 25 | ||
26 | #include <nvgpu/types.h> | ||
27 | |||
26 | struct gk20a; | 28 | struct gk20a; |
27 | 29 | ||
28 | void gp10b_slcg_bus_load_gating_prod(struct gk20a *g, | 30 | void gp10b_slcg_bus_load_gating_prod(struct gk20a *g, |
diff --git a/drivers/gpu/nvgpu/common/clock_gating/gv100_gating_reglist.h b/drivers/gpu/nvgpu/common/clock_gating/gv100_gating_reglist.h index 279bc4d2..9419031f 100644 --- a/drivers/gpu/nvgpu/common/clock_gating/gv100_gating_reglist.h +++ b/drivers/gpu/nvgpu/common/clock_gating/gv100_gating_reglist.h | |||
@@ -23,6 +23,8 @@ | |||
23 | #ifndef GV100_GATING_REGLIST_H | 23 | #ifndef GV100_GATING_REGLIST_H |
24 | #define GV100_GATING_REGLIST_H | 24 | #define GV100_GATING_REGLIST_H |
25 | 25 | ||
26 | #include <nvgpu/types.h> | ||
27 | |||
26 | struct gk20a; | 28 | struct gk20a; |
27 | 29 | ||
28 | void gv100_slcg_bus_load_gating_prod(struct gk20a *g, | 30 | void gv100_slcg_bus_load_gating_prod(struct gk20a *g, |
diff --git a/drivers/gpu/nvgpu/common/clock_gating/gv11b_gating_reglist.h b/drivers/gpu/nvgpu/common/clock_gating/gv11b_gating_reglist.h index 87a1e5c6..155b6e2e 100644 --- a/drivers/gpu/nvgpu/common/clock_gating/gv11b_gating_reglist.h +++ b/drivers/gpu/nvgpu/common/clock_gating/gv11b_gating_reglist.h | |||
@@ -23,6 +23,8 @@ | |||
23 | #ifndef GV11B_GATING_REGLIST_H | 23 | #ifndef GV11B_GATING_REGLIST_H |
24 | #define GV11B_GATING_REGLIST_H | 24 | #define GV11B_GATING_REGLIST_H |
25 | 25 | ||
26 | #include <nvgpu/types.h> | ||
27 | |||
26 | struct gk20a; | 28 | struct gk20a; |
27 | 29 | ||
28 | void gv11b_slcg_bus_load_gating_prod(struct gk20a *g, | 30 | void gv11b_slcg_bus_load_gating_prod(struct gk20a *g, |