diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-11-09 18:12:41 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-11-17 19:29:41 -0500 |
commit | 9d04e970937657d11620d812c29a5d10828440fc (patch) | |
tree | 78d06a0773317241ddfdc9d2b1bc6c871f3175c7 /drivers/gpu/nvgpu/gk20a/gk20a.h | |
parent | 35ae4194a05d47aa6d79353428f81f2ca47ce90f (diff) |
gpu: nvgpu: Remove separation of t18x code
Remove separation of t18x specific code and fields and the associated
ifdefs. We can build T18x code in always.
Change-Id: I4e8eae9c30335632a2da48b418c6138193831b4f
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1595431
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index fef9f498..8d8bfbec 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -72,12 +72,10 @@ struct nvgpu_ctxsw_trace_filter; | |||
72 | #include "pmu_gk20a.h" | 72 | #include "pmu_gk20a.h" |
73 | #include "priv_ring_gk20a.h" | 73 | #include "priv_ring_gk20a.h" |
74 | #include "therm_gk20a.h" | 74 | #include "therm_gk20a.h" |
75 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC | ||
76 | #include "clk/clk.h" | 75 | #include "clk/clk.h" |
77 | #include "perf/perf.h" | 76 | #include "perf/perf.h" |
78 | #include "pmgr/pmgr.h" | 77 | #include "pmgr/pmgr.h" |
79 | #include "therm/thrm.h" | 78 | #include "therm/thrm.h" |
80 | #endif | ||
81 | #include "ecc_gk20a.h" | 79 | #include "ecc_gk20a.h" |
82 | 80 | ||
83 | /* PTIMER_REF_FREQ_HZ corresponds to a period of 32 nanoseconds. | 81 | /* PTIMER_REF_FREQ_HZ corresponds to a period of 32 nanoseconds. |
@@ -1128,12 +1126,10 @@ struct gk20a { | |||
1128 | struct nvgpu_pmu pmu; | 1126 | struct nvgpu_pmu pmu; |
1129 | struct acr_desc acr; | 1127 | struct acr_desc acr; |
1130 | struct ecc_gk20a ecc; | 1128 | struct ecc_gk20a ecc; |
1131 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC | ||
1132 | struct clk_pmupstate clk_pmu; | 1129 | struct clk_pmupstate clk_pmu; |
1133 | struct perf_pmupstate perf_pmu; | 1130 | struct perf_pmupstate perf_pmu; |
1134 | struct pmgr_pmupstate pmgr_pmu; | 1131 | struct pmgr_pmupstate pmgr_pmu; |
1135 | struct therm_pmupstate therm_pmu; | 1132 | struct therm_pmupstate therm_pmu; |
1136 | #endif | ||
1137 | 1133 | ||
1138 | #ifdef CONFIG_DEBUG_FS | 1134 | #ifdef CONFIG_DEBUG_FS |
1139 | struct railgate_stats pstats; | 1135 | struct railgate_stats pstats; |