diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 5bdd81ac..c029e9e0 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -46,9 +46,7 @@ | |||
46 | #include "mc_gk20a.h" | 46 | #include "mc_gk20a.h" |
47 | #include "hal.h" | 47 | #include "hal.h" |
48 | #include "bus_gk20a.h" | 48 | #include "bus_gk20a.h" |
49 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC | ||
50 | #include "pstate/pstate.h" | 49 | #include "pstate/pstate.h" |
51 | #endif | ||
52 | 50 | ||
53 | #ifdef CONFIG_TEGRA_19x_GPU | 51 | #ifdef CONFIG_TEGRA_19x_GPU |
54 | #include "nvgpu_gpuid_t19x.h" | 52 | #include "nvgpu_gpuid_t19x.h" |
@@ -112,10 +110,9 @@ int gk20a_prepare_poweroff(struct gk20a *g) | |||
112 | if (g->ops.clk.suspend_clk_support) | 110 | if (g->ops.clk.suspend_clk_support) |
113 | ret |= g->ops.clk.suspend_clk_support(g); | 111 | ret |= g->ops.clk.suspend_clk_support(g); |
114 | 112 | ||
115 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC | ||
116 | if (nvgpu_is_enabled(g, NVGPU_PMU_PSTATE)) | 113 | if (nvgpu_is_enabled(g, NVGPU_PMU_PSTATE)) |
117 | gk20a_deinit_pstate_support(g); | 114 | gk20a_deinit_pstate_support(g); |
118 | #endif | 115 | |
119 | g->power_on = false; | 116 | g->power_on = false; |
120 | 117 | ||
121 | return ret; | 118 | return ret; |
@@ -240,7 +237,6 @@ int gk20a_finalize_poweron(struct gk20a *g) | |||
240 | } | 237 | } |
241 | } | 238 | } |
242 | 239 | ||
243 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC | ||
244 | if (nvgpu_is_enabled(g, NVGPU_PMU_PSTATE)) { | 240 | if (nvgpu_is_enabled(g, NVGPU_PMU_PSTATE)) { |
245 | err = gk20a_init_pstate_support(g); | 241 | err = gk20a_init_pstate_support(g); |
246 | if (err) { | 242 | if (err) { |
@@ -248,7 +244,6 @@ int gk20a_finalize_poweron(struct gk20a *g) | |||
248 | goto done; | 244 | goto done; |
249 | } | 245 | } |
250 | } | 246 | } |
251 | #endif | ||
252 | 247 | ||
253 | if (g->ops.pmu.is_pmu_supported(g)) { | 248 | if (g->ops.pmu.is_pmu_supported(g)) { |
254 | err = nvgpu_init_pmu_support(g); | 249 | err = nvgpu_init_pmu_support(g); |
@@ -264,7 +259,6 @@ int gk20a_finalize_poweron(struct gk20a *g) | |||
264 | goto done; | 259 | goto done; |
265 | } | 260 | } |
266 | 261 | ||
267 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC | ||
268 | if (nvgpu_is_enabled(g, NVGPU_PMU_PSTATE)) { | 262 | if (nvgpu_is_enabled(g, NVGPU_PMU_PSTATE)) { |
269 | err = gk20a_init_pstate_pmu_support(g); | 263 | err = gk20a_init_pstate_pmu_support(g); |
270 | if (err) { | 264 | if (err) { |
@@ -278,7 +272,6 @@ int gk20a_finalize_poweron(struct gk20a *g) | |||
278 | nvgpu_err(g, "failed to init clk arb"); | 272 | nvgpu_err(g, "failed to init clk arb"); |
279 | goto done; | 273 | goto done; |
280 | } | 274 | } |
281 | #endif | ||
282 | 275 | ||
283 | err = gk20a_init_therm_support(g); | 276 | err = gk20a_init_therm_support(g); |
284 | if (err) { | 277 | if (err) { |