From 9d04e970937657d11620d812c29a5d10828440fc Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 9 Nov 2017 15:12:41 -0800 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1595431 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/gk20a.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c') 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 @@ #include "mc_gk20a.h" #include "hal.h" #include "bus_gk20a.h" -#ifdef CONFIG_ARCH_TEGRA_18x_SOC #include "pstate/pstate.h" -#endif #ifdef CONFIG_TEGRA_19x_GPU #include "nvgpu_gpuid_t19x.h" @@ -112,10 +110,9 @@ int gk20a_prepare_poweroff(struct gk20a *g) if (g->ops.clk.suspend_clk_support) ret |= g->ops.clk.suspend_clk_support(g); -#ifdef CONFIG_ARCH_TEGRA_18x_SOC if (nvgpu_is_enabled(g, NVGPU_PMU_PSTATE)) gk20a_deinit_pstate_support(g); -#endif + g->power_on = false; return ret; @@ -240,7 +237,6 @@ int gk20a_finalize_poweron(struct gk20a *g) } } -#ifdef CONFIG_ARCH_TEGRA_18x_SOC if (nvgpu_is_enabled(g, NVGPU_PMU_PSTATE)) { err = gk20a_init_pstate_support(g); if (err) { @@ -248,7 +244,6 @@ int gk20a_finalize_poweron(struct gk20a *g) goto done; } } -#endif if (g->ops.pmu.is_pmu_supported(g)) { err = nvgpu_init_pmu_support(g); @@ -264,7 +259,6 @@ int gk20a_finalize_poweron(struct gk20a *g) goto done; } -#ifdef CONFIG_ARCH_TEGRA_18x_SOC if (nvgpu_is_enabled(g, NVGPU_PMU_PSTATE)) { err = gk20a_init_pstate_pmu_support(g); if (err) { @@ -278,7 +272,6 @@ int gk20a_finalize_poweron(struct gk20a *g) nvgpu_err(g, "failed to init clk arb"); goto done; } -#endif err = gk20a_init_therm_support(g); if (err) { -- cgit v1.2.2