diff options
author | Alex Waterman <alexw@nvidia.com> | 2017-01-31 20:24:02 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-02-07 17:54:02 -0500 |
commit | 8c3dddd81fb0ab2bd9e8582c0765734432931caf (patch) | |
tree | 5ae3836797611c025e3703c47d590de557eccf79 | |
parent | c6594c744d8fca738a1a8f5177c84a05899695dc (diff) |
gpu: nvgpu: Fix more pmu circular dependencies
Similar to patch 67fc4629892ab60d6335752b93d883ef690f1ea4 fix
more circular dependencies arising from #include'ing gk20a.h
for no apparent reason.
Bug 200192125
Coverity ID 2011397
Coverity ID 2011398
Change-Id: I75bcb3e4e66b680498b0e20d645ab9543aae6697
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1296947
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmuif/gpmuifclk.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmuif/gpmuifpmgr.h | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmuif/gpmuifthermsensor.h | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmuif/gpmuifvolt.h | 2 |
5 files changed, 2 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c index bd9d4f2b..0a2d36fe 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | |||
@@ -26,6 +26,7 @@ | |||
26 | 26 | ||
27 | #include <nvgpu/timers.h> | 27 | #include <nvgpu/timers.h> |
28 | 28 | ||
29 | #include "gk20a.h" | ||
29 | #include "gr_gk20a.h" | 30 | #include "gr_gk20a.h" |
30 | #include "semaphore_gk20a.h" | 31 | #include "semaphore_gk20a.h" |
31 | #include "nvgpu_common.h" | 32 | #include "nvgpu_common.h" |
diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifclk.h b/drivers/gpu/nvgpu/pmuif/gpmuifclk.h index 70f26707..0af94eaa 100644 --- a/drivers/gpu/nvgpu/pmuif/gpmuifclk.h +++ b/drivers/gpu/nvgpu/pmuif/gpmuifclk.h | |||
@@ -14,8 +14,6 @@ | |||
14 | #ifndef _GPMUIFCLK_H_ | 14 | #ifndef _GPMUIFCLK_H_ |
15 | #define _GPMUIFCLK_H_ | 15 | #define _GPMUIFCLK_H_ |
16 | 16 | ||
17 | #include "gk20a/gk20a.h" | ||
18 | #include "gk20a/pmu_gk20a.h" | ||
19 | #include "ctrl/ctrlboardobj.h" | 17 | #include "ctrl/ctrlboardobj.h" |
20 | #include "ctrl/ctrlvolt.h" | 18 | #include "ctrl/ctrlvolt.h" |
21 | #include "ctrl/ctrlperf.h" | 19 | #include "ctrl/ctrlperf.h" |
diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifpmgr.h b/drivers/gpu/nvgpu/pmuif/gpmuifpmgr.h index b985b015..89cc27d1 100644 --- a/drivers/gpu/nvgpu/pmuif/gpmuifpmgr.h +++ b/drivers/gpu/nvgpu/pmuif/gpmuifpmgr.h | |||
@@ -14,8 +14,7 @@ | |||
14 | #ifndef _GPMUIFPMGR_H_ | 14 | #ifndef _GPMUIFPMGR_H_ |
15 | #define _GPMUIFPMGR_H_ | 15 | #define _GPMUIFPMGR_H_ |
16 | 16 | ||
17 | #include "gk20a/gk20a.h" | 17 | #include "gk20a/pmu_common.h" |
18 | #include "gk20a/pmu_gk20a.h" | ||
19 | #include "ctrl/ctrlpmgr.h" | 18 | #include "ctrl/ctrlpmgr.h" |
20 | #include "pmuif/gpmuifboardobj.h" | 19 | #include "pmuif/gpmuifboardobj.h" |
21 | #include "gk20a/pmu_common.h" | 20 | #include "gk20a/pmu_common.h" |
diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifthermsensor.h b/drivers/gpu/nvgpu/pmuif/gpmuifthermsensor.h index 498661b3..f0f1340e 100644 --- a/drivers/gpu/nvgpu/pmuif/gpmuifthermsensor.h +++ b/drivers/gpu/nvgpu/pmuif/gpmuifthermsensor.h | |||
@@ -14,8 +14,6 @@ | |||
14 | #ifndef _GPMUIFTHERMSENSOR_H_ | 14 | #ifndef _GPMUIFTHERMSENSOR_H_ |
15 | #define _GPMUIFTHERMSENSOR_H_ | 15 | #define _GPMUIFTHERMSENSOR_H_ |
16 | 16 | ||
17 | #include "gk20a/gk20a.h" | ||
18 | #include "gk20a/pmu_gk20a.h" | ||
19 | #include "ctrl/ctrltherm.h" | 17 | #include "ctrl/ctrltherm.h" |
20 | #include "pmuif/gpmuifboardobj.h" | 18 | #include "pmuif/gpmuifboardobj.h" |
21 | #include "gk20a/pmu_common.h" | 19 | #include "gk20a/pmu_common.h" |
@@ -74,4 +72,3 @@ union nv_pmu_therm_therm_channel_boardobj_set_union { | |||
74 | NV_PMU_BOARDOBJ_GRP_SET_MAKE_E32(therm, therm_channel); | 72 | NV_PMU_BOARDOBJ_GRP_SET_MAKE_E32(therm, therm_channel); |
75 | 73 | ||
76 | #endif | 74 | #endif |
77 | |||
diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifvolt.h b/drivers/gpu/nvgpu/pmuif/gpmuifvolt.h index fbce6031..359b3a7a 100644 --- a/drivers/gpu/nvgpu/pmuif/gpmuifvolt.h +++ b/drivers/gpu/nvgpu/pmuif/gpmuifvolt.h | |||
@@ -13,8 +13,6 @@ | |||
13 | #ifndef _GPMUIFVOLT_H_ | 13 | #ifndef _GPMUIFVOLT_H_ |
14 | #define _GPMUIFVOLT_H_ | 14 | #define _GPMUIFVOLT_H_ |
15 | 15 | ||
16 | #include "gk20a/gk20a.h" | ||
17 | #include "gk20a/pmu_gk20a.h" | ||
18 | #include "pmuif/gpmuifboardobj.h" | 16 | #include "pmuif/gpmuifboardobj.h" |
19 | #include "gk20a/pmu_common.h" | 17 | #include "gk20a/pmu_common.h" |
20 | #include "ctrl/ctrlvolt.h" | 18 | #include "ctrl/ctrlvolt.h" |