diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-06-20 15:26:50 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-06-21 20:34:44 -0400 |
commit | 2ffbdc50d884215ba043e8afd3c3bcbefd1e66f8 (patch) | |
tree | 02b539fa7d03466512eee5c187ce893f61a275a9 | |
parent | 581e8b4ec86b13706e4423609a543fc2510b4ffe (diff) |
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 <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1505926
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 6 | ||||
-rw-r--r-- | 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 @@ | |||
54 | 54 | ||
55 | #include "clk.h" | 55 | #include "clk.h" |
56 | 56 | ||
57 | #include "../../../arch/arm/mach-tegra/iomap.h" | ||
58 | |||
57 | #define TEGRA_GK20A_BW_PER_FREQ 32 | 59 | #define TEGRA_GK20A_BW_PER_FREQ 32 |
58 | #define TEGRA_GM20B_BW_PER_FREQ 64 | 60 | #define TEGRA_GM20B_BW_PER_FREQ 64 |
59 | #define TEGRA_DDR3_BW_PER_FREQ 16 | 61 | #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; | |||
35 | struct nvgpu_nvhost_dev; | 35 | struct nvgpu_nvhost_dev; |
36 | struct nvgpu_cpu_time_correlation_sample; | 36 | struct nvgpu_cpu_time_correlation_sample; |
37 | 37 | ||
38 | #include <linux/sched.h> | ||
39 | #include <nvgpu/lock.h> | 38 | #include <nvgpu/lock.h> |
40 | #include <nvgpu/thread.h> | 39 | #include <nvgpu/thread.h> |
41 | #include <linux/version.h> | ||
42 | #include <linux/cdev.h> | 40 | #include <linux/cdev.h> |
43 | #ifdef CONFIG_DEBUG_FS | 41 | #ifdef CONFIG_DEBUG_FS |
44 | #include <linux/debugfs.h> | 42 | #include <linux/debugfs.h> |
45 | #endif | 43 | #endif |
46 | 44 | ||
47 | #include "../../../arch/arm/mach-tegra/iomap.h" | ||
48 | |||
49 | #include <nvgpu/as.h> | 45 | #include <nvgpu/as.h> |
50 | #include <nvgpu/log.h> | 46 | #include <nvgpu/log.h> |
51 | #include <nvgpu/pramin.h> | 47 | #include <nvgpu/pramin.h> |
@@ -63,8 +59,6 @@ struct nvgpu_cpu_time_correlation_sample; | |||
63 | #include "pmu_gk20a.h" | 59 | #include "pmu_gk20a.h" |
64 | #include "priv_ring_gk20a.h" | 60 | #include "priv_ring_gk20a.h" |
65 | #include "therm_gk20a.h" | 61 | #include "therm_gk20a.h" |
66 | #include "gm20b/acr_gm20b.h" | ||
67 | #include "gk20a/bus_gk20a.h" | ||
68 | #include "cde_gk20a.h" | 62 | #include "cde_gk20a.h" |
69 | #include "sched_gk20a.h" | 63 | #include "sched_gk20a.h" |
70 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC | 64 | #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 @@ | |||
16 | #include "gk20a/gk20a.h" | 16 | #include "gk20a/gk20a.h" |
17 | #include "gk20a/pmu_gk20a.h" | 17 | #include "gk20a/pmu_gk20a.h" |
18 | 18 | ||
19 | #include "gm20b/acr_gm20b.h" | ||
19 | #include "gm20b/pmu_gm20b.h" | 20 | #include "gm20b/pmu_gm20b.h" |
20 | #include "gp10b/pmu_gp10b.h" | 21 | #include "gp10b/pmu_gp10b.h" |
21 | #include "gp106/pmu_gp106.h" | 22 | #include "gp106/pmu_gp106.h" |