From 2ffbdc50d884215ba043e8afd3c3bcbefd1e66f8 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Tue, 20 Jun 2017 12:26:50 -0700 Subject: gpu: nvgpu: Remove some #includes from gk20a.h linux/version.h and linux/sched.h are not used by gk20a.h, so remove them. acr_gm20b.h and bus_gk20a.h are not needed by gk20a.h, so remove them. pmu_gp106.c relies on implicit #include of acr_gm20b.h by gk20a.h, so add that as an explicit #include. Remove #include of iomap.h. platform_gk20a_tegra.c legacy rail gating code still relies on access to that header, so add it as explicit include. JIRA NVGPU-38 Change-Id: I1cf57b9d3a7ee5e3cad298341107e317b4b8662f Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1505926 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c | 2 ++ drivers/gpu/nvgpu/gk20a/gk20a.h | 6 ------ drivers/gpu/nvgpu/gp106/pmu_gp106.c | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c index b0f6ee7d..ec14c08e 100644 --- a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c +++ b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c @@ -54,6 +54,8 @@ #include "clk.h" +#include "../../../arch/arm/mach-tegra/iomap.h" + #define TEGRA_GK20A_BW_PER_FREQ 32 #define TEGRA_GM20B_BW_PER_FREQ 64 #define TEGRA_DDR3_BW_PER_FREQ 16 diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index d036a5ea..5acc1074 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h @@ -35,17 +35,13 @@ struct nvgpu_clk_pll_debug_data; struct nvgpu_nvhost_dev; struct nvgpu_cpu_time_correlation_sample; -#include #include #include -#include #include #ifdef CONFIG_DEBUG_FS #include #endif -#include "../../../arch/arm/mach-tegra/iomap.h" - #include #include #include @@ -63,8 +59,6 @@ struct nvgpu_cpu_time_correlation_sample; #include "pmu_gk20a.h" #include "priv_ring_gk20a.h" #include "therm_gk20a.h" -#include "gm20b/acr_gm20b.h" -#include "gk20a/bus_gk20a.h" #include "cde_gk20a.h" #include "sched_gk20a.h" #ifdef CONFIG_ARCH_TEGRA_18x_SOC diff --git a/drivers/gpu/nvgpu/gp106/pmu_gp106.c b/drivers/gpu/nvgpu/gp106/pmu_gp106.c index 2ecd2ef1..57ccd269 100644 --- a/drivers/gpu/nvgpu/gp106/pmu_gp106.c +++ b/drivers/gpu/nvgpu/gp106/pmu_gp106.c @@ -16,6 +16,7 @@ #include "gk20a/gk20a.h" #include "gk20a/pmu_gk20a.h" +#include "gm20b/acr_gm20b.h" #include "gm20b/pmu_gm20b.h" #include "gp10b/pmu_gp10b.h" #include "gp106/pmu_gp106.h" -- cgit v1.2.2