diff options
author | Debarshi Dutta <ddutta@nvidia.com> | 2018-07-27 01:47:41 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-07-30 14:24:06 -0400 |
commit | 82a90170d3ecbed5106409546f33afa5eaea3ddf (patch) | |
tree | 11a9239c15d52fce7c903fe5c23db42be30f782b /drivers/gpu/nvgpu/common | |
parent | 4cbec6b2c7f74f309fb4bc5d4981c42ae6ea3bcd (diff) |
gk20a: nvgpu: Remove io.h dependency from gk20a.h
In the current code, gk20a.h includes io.h which gets directly included
in a lot of other files. io.h contains methods which uses a struct
gk20a as a parameter leading to a circular dependency between io.h
and gk20a.h. This can be mitigated by removing io.h from gk20a.h as
part of larger effort to moving gk20a.h to nvgpu/gk20a.h
JIRA NVGPU-597
Change-Id: I93e504fa9371b88152737b342a75580c65e8f712
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1787316
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r-- | drivers/gpu/nvgpu/common/bus/bus_gk20a.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/bus/bus_gm20b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/bus/bus_gp10b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/bus/bus_gv100.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gk20a.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gm20b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gp106.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gv100.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gv11b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/pramin.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/sim_pci.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/vbios/bios.c | 1 |
13 files changed, 15 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/common/bus/bus_gk20a.c b/drivers/gpu/nvgpu/common/bus/bus_gk20a.c index d4ef41c1..d0091cee 100644 --- a/drivers/gpu/nvgpu/common/bus/bus_gk20a.c +++ b/drivers/gpu/nvgpu/common/bus/bus_gk20a.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <nvgpu/log.h> | 23 | #include <nvgpu/log.h> |
24 | #include <nvgpu/soc.h> | 24 | #include <nvgpu/soc.h> |
25 | #include <nvgpu/mm.h> | 25 | #include <nvgpu/mm.h> |
26 | #include <nvgpu/io.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
28 | #include "bus_gk20a.h" | 29 | #include "bus_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/common/bus/bus_gm20b.c b/drivers/gpu/nvgpu/common/bus/bus_gm20b.c index 669cb0ae..d2c4c2b7 100644 --- a/drivers/gpu/nvgpu/common/bus/bus_gm20b.c +++ b/drivers/gpu/nvgpu/common/bus/bus_gm20b.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <nvgpu/timers.h> | 25 | #include <nvgpu/timers.h> |
26 | #include <nvgpu/mm.h> | 26 | #include <nvgpu/mm.h> |
27 | #include <nvgpu/enabled.h> | 27 | #include <nvgpu/enabled.h> |
28 | #include <nvgpu/io.h> | ||
28 | 29 | ||
29 | #include "gk20a/gk20a.h" | 30 | #include "gk20a/gk20a.h" |
30 | #include "bus_gm20b.h" | 31 | #include "bus_gm20b.h" |
diff --git a/drivers/gpu/nvgpu/common/bus/bus_gp10b.c b/drivers/gpu/nvgpu/common/bus/bus_gp10b.c index 86b548f2..11e60c53 100644 --- a/drivers/gpu/nvgpu/common/bus/bus_gp10b.c +++ b/drivers/gpu/nvgpu/common/bus/bus_gp10b.c | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #include <nvgpu/timers.h> | 23 | #include <nvgpu/timers.h> |
24 | #include <nvgpu/mm.h> | 24 | #include <nvgpu/mm.h> |
25 | #include <nvgpu/io.h> | ||
25 | 26 | ||
26 | #include "bus_gp10b.h" | 27 | #include "bus_gp10b.h" |
27 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
diff --git a/drivers/gpu/nvgpu/common/bus/bus_gv100.c b/drivers/gpu/nvgpu/common/bus/bus_gv100.c index 2aa15e67..eb0387e6 100644 --- a/drivers/gpu/nvgpu/common/bus/bus_gv100.c +++ b/drivers/gpu/nvgpu/common/bus/bus_gv100.c | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #include <nvgpu/timers.h> | 23 | #include <nvgpu/timers.h> |
24 | #include <nvgpu/mm.h> | 24 | #include <nvgpu/mm.h> |
25 | #include <nvgpu/io.h> | ||
25 | 26 | ||
26 | #include "bus_gv100.h" | 27 | #include "bus_gv100.h" |
27 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gk20a.c b/drivers/gpu/nvgpu/common/fb/fb_gk20a.c index d27ac9d0..14634923 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gk20a.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gk20a.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include "fb_gk20a.h" | 29 | #include "fb_gk20a.h" |
30 | 30 | ||
31 | #include <nvgpu/timers.h> | 31 | #include <nvgpu/timers.h> |
32 | #include <nvgpu/io.h> | ||
32 | 33 | ||
33 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> | 34 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> |
34 | #include <nvgpu/hw/gk20a/hw_fb_gk20a.h> | 35 | #include <nvgpu/hw/gk20a/hw_fb_gk20a.h> |
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gm20b.c b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c index bd093b31..00ae7b5f 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gm20b.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c | |||
@@ -29,6 +29,8 @@ | |||
29 | #include "fb_gk20a.h" | 29 | #include "fb_gk20a.h" |
30 | #include "fb_gm20b.h" | 30 | #include "fb_gm20b.h" |
31 | 31 | ||
32 | #include <nvgpu/io.h> | ||
33 | |||
32 | #include <nvgpu/hw/gm20b/hw_fb_gm20b.h> | 34 | #include <nvgpu/hw/gm20b/hw_fb_gm20b.h> |
33 | #include <nvgpu/hw/gm20b/hw_top_gm20b.h> | 35 | #include <nvgpu/hw/gm20b/hw_top_gm20b.h> |
34 | #include <nvgpu/hw/gm20b/hw_gmmu_gm20b.h> | 36 | #include <nvgpu/hw/gm20b/hw_gmmu_gm20b.h> |
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gp106.c b/drivers/gpu/nvgpu/common/fb/fb_gp106.c index 6f257db4..094f9fa4 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gp106.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gp106.c | |||
@@ -25,6 +25,8 @@ | |||
25 | #include "fb_gp10b.h" | 25 | #include "fb_gp10b.h" |
26 | #include "fb_gp106.h" | 26 | #include "fb_gp106.h" |
27 | 27 | ||
28 | #include <nvgpu/io.h> | ||
29 | |||
28 | #include <nvgpu/hw/gp106/hw_fb_gp106.h> | 30 | #include <nvgpu/hw/gp106/hw_fb_gp106.h> |
29 | 31 | ||
30 | #define HW_SCRUB_TIMEOUT_DEFAULT 100 /* usec */ | 32 | #define HW_SCRUB_TIMEOUT_DEFAULT 100 /* usec */ |
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gv100.c b/drivers/gpu/nvgpu/common/fb/fb_gv100.c index 155c1e8b..8857f02b 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gv100.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gv100.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <nvgpu/firmware.h> | 35 | #include <nvgpu/firmware.h> |
36 | #include <nvgpu/pmu.h> | 36 | #include <nvgpu/pmu.h> |
37 | #include <nvgpu/falcon.h> | 37 | #include <nvgpu/falcon.h> |
38 | #include <nvgpu/io.h> | ||
38 | 39 | ||
39 | #include "gk20a/gk20a.h" | 40 | #include "gk20a/gk20a.h" |
40 | #include "gm20b/acr_gm20b.h" | 41 | #include "gm20b/acr_gm20b.h" |
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c index a7e5de68..664b2dd1 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <nvgpu/bug.h> | 30 | #include <nvgpu/bug.h> |
31 | #include <nvgpu/soc.h> | 31 | #include <nvgpu/soc.h> |
32 | #include <nvgpu/ptimer.h> | 32 | #include <nvgpu/ptimer.h> |
33 | #include <nvgpu/io.h> | ||
33 | 34 | ||
34 | #include "gk20a/gk20a.h" | 35 | #include "gk20a/gk20a.h" |
35 | #include "gk20a/mm_gk20a.h" | 36 | #include "gk20a/mm_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/common/pramin.c b/drivers/gpu/nvgpu/common/pramin.c index 99d588aa..ba6a92ba 100644 --- a/drivers/gpu/nvgpu/common/pramin.c +++ b/drivers/gpu/nvgpu/common/pramin.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <nvgpu/page_allocator.h> | 24 | #include <nvgpu/page_allocator.h> |
25 | #include <nvgpu/enabled.h> | 25 | #include <nvgpu/enabled.h> |
26 | #include <nvgpu/sizes.h> | 26 | #include <nvgpu/sizes.h> |
27 | #include <nvgpu/io.h> | ||
27 | 28 | ||
28 | #include "gk20a/gk20a.h" | 29 | #include "gk20a/gk20a.h" |
29 | 30 | ||
diff --git a/drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.c b/drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.c index 52e47601..0b3188ee 100644 --- a/drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.c +++ b/drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.c | |||
@@ -21,6 +21,7 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/log.h> | 23 | #include <nvgpu/log.h> |
24 | #include <nvgpu/io.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | 26 | #include "gk20a/gk20a.h" |
26 | #include "ptimer_gk20a.h" | 27 | #include "ptimer_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/common/sim_pci.c b/drivers/gpu/nvgpu/common/sim_pci.c index b05504fe..65950c4c 100644 --- a/drivers/gpu/nvgpu/common/sim_pci.c +++ b/drivers/gpu/nvgpu/common/sim_pci.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <nvgpu/dma.h> | 25 | #include <nvgpu/dma.h> |
26 | #include <nvgpu/hw_sim_pci.h> | 26 | #include <nvgpu/hw_sim_pci.h> |
27 | #include <nvgpu/sim.h> | 27 | #include <nvgpu/sim.h> |
28 | #include <nvgpu/io.h> | ||
28 | #include "gk20a/gk20a.h" | 29 | #include "gk20a/gk20a.h" |
29 | 30 | ||
30 | static inline u32 sim_msg_header_size(void) | 31 | static inline u32 sim_msg_header_size(void) |
diff --git a/drivers/gpu/nvgpu/common/vbios/bios.c b/drivers/gpu/nvgpu/common/vbios/bios.c index de1b30e8..12c0eded 100644 --- a/drivers/gpu/nvgpu/common/vbios/bios.c +++ b/drivers/gpu/nvgpu/common/vbios/bios.c | |||
@@ -21,6 +21,7 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/bios.h> | 23 | #include <nvgpu/bios.h> |
24 | #include <nvgpu/io.h> | ||
24 | #include <nvgpu/hw/gp106/hw_gc6_gp106.h> | 25 | #include <nvgpu/hw/gp106/hw_gc6_gp106.h> |
25 | 26 | ||
26 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |