diff options
author | Debarshi Dutta <ddutta@nvidia.com> | 2018-08-02 02:18:44 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-08-08 23:14:16 -0400 |
commit | db7bb6548b6f3c9da0f40a87ccbb9233c761c598 (patch) | |
tree | acadaacbd24ccb3f64784afffdaad7d1cdb3a884 /drivers/gpu/nvgpu/gk20a | |
parent | a09b9cd587d27a3ef6479a17631c3497d447e7a9 (diff) |
gpu: nvgpu: remove clk_arb.h to gk20a.h circular dependency
clk_arb.h and gk20a.h has circular dependencies to each other. This is
removed by forward declaring struct gk20a in clk_arb.h and removing the
header gk20a.h from clk_arb.h and similarly forward declaring struct
nvgpu_clk_arb in gk20a.h and removing the header clk_arb.h from gk20a.h
alongwith putting headers in every execution unit which calls clk_arb.h
related methods.
JIRA NVGPU-597
Change-Id: I7cedca17206c148b21d93e5d7f0d88c2f98b979a
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1790915
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 6a0b5bba..7fec4da7 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <nvgpu/mm.h> | 35 | #include <nvgpu/mm.h> |
36 | #include <nvgpu/ctxsw_trace.h> | 36 | #include <nvgpu/ctxsw_trace.h> |
37 | #include <nvgpu/soc.h> | 37 | #include <nvgpu/soc.h> |
38 | #include <nvgpu/clk_arb.h> | ||
38 | 39 | ||
39 | #include <trace/events/gk20a.h> | 40 | #include <trace/events/gk20a.h> |
40 | 41 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 2f940553..ffa5e318 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -41,6 +41,7 @@ struct nvgpu_nvhost_dev; | |||
41 | struct nvgpu_cpu_time_correlation_sample; | 41 | struct nvgpu_cpu_time_correlation_sample; |
42 | struct nvgpu_mem_sgt; | 42 | struct nvgpu_mem_sgt; |
43 | struct nvgpu_warpstate; | 43 | struct nvgpu_warpstate; |
44 | struct nvgpu_clk_arb; | ||
44 | #ifdef CONFIG_GK20A_CTXSW_TRACE | 45 | #ifdef CONFIG_GK20A_CTXSW_TRACE |
45 | struct nvgpu_ctxsw_trace_filter; | 46 | struct nvgpu_ctxsw_trace_filter; |
46 | #endif | 47 | #endif |
@@ -59,7 +60,6 @@ struct nvgpu_ctxsw_trace_filter; | |||
59 | #include <nvgpu/atomic.h> | 60 | #include <nvgpu/atomic.h> |
60 | #include <nvgpu/barrier.h> | 61 | #include <nvgpu/barrier.h> |
61 | #include <nvgpu/rwsem.h> | 62 | #include <nvgpu/rwsem.h> |
62 | #include <nvgpu/clk_arb.h> | ||
63 | #include <nvgpu/nvlink.h> | 63 | #include <nvgpu/nvlink.h> |
64 | #include <nvgpu/sim.h> | 64 | #include <nvgpu/sim.h> |
65 | #include <nvgpu/ecc.h> | 65 | #include <nvgpu/ecc.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c index 8dbeed40..90d6e15b 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <nvgpu/falcon.h> | 32 | #include <nvgpu/falcon.h> |
33 | #include <nvgpu/mm.h> | 33 | #include <nvgpu/mm.h> |
34 | #include <nvgpu/io.h> | 34 | #include <nvgpu/io.h> |
35 | #include <nvgpu/clk_arb.h> | ||
35 | 36 | ||
36 | #include "gk20a.h" | 37 | #include "gk20a.h" |
37 | #include "gr_gk20a.h" | 38 | #include "gr_gk20a.h" |