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/gm20b | |
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/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/acr_gm20b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/clk_gm20b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/fifo_gm20b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/fuse_gm20b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/gr_gm20b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/pmu_gm20b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/therm_gm20b.c | 1 |
8 files changed, 9 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c index 1694a1ad..2350f362 100644 --- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <nvgpu/falcon.h> | 33 | #include <nvgpu/falcon.h> |
34 | #include <nvgpu/enabled.h> | 34 | #include <nvgpu/enabled.h> |
35 | #include <nvgpu/mm.h> | 35 | #include <nvgpu/mm.h> |
36 | #include <nvgpu/io.h> | ||
36 | 37 | ||
37 | #include "gk20a/gk20a.h" | 38 | #include "gk20a/gk20a.h" |
38 | #include "gk20a/pmu_gk20a.h" | 39 | #include "gk20a/pmu_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c index f47f6cf6..558415f8 100644 --- a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <nvgpu/bug.h> | 30 | #include <nvgpu/bug.h> |
31 | #include <nvgpu/log.h> | 31 | #include <nvgpu/log.h> |
32 | #include <nvgpu/types.h> | 32 | #include <nvgpu/types.h> |
33 | #include <nvgpu/io.h> | ||
33 | 34 | ||
34 | #include <nvgpu/hw/gm20b/hw_trim_gm20b.h> | 35 | #include <nvgpu/hw/gm20b/hw_trim_gm20b.h> |
35 | #include <nvgpu/hw/gm20b/hw_therm_gm20b.h> | 36 | #include <nvgpu/hw/gm20b/hw_therm_gm20b.h> |
diff --git a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c index b73abeda..96262934 100644 --- a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <nvgpu/barrier.h> | 33 | #include <nvgpu/barrier.h> |
34 | #include <nvgpu/mm.h> | 34 | #include <nvgpu/mm.h> |
35 | #include <nvgpu/enabled.h> | 35 | #include <nvgpu/enabled.h> |
36 | #include <nvgpu/io.h> | ||
36 | 37 | ||
37 | #include <nvgpu/hw/gm20b/hw_ccsr_gm20b.h> | 38 | #include <nvgpu/hw/gm20b/hw_ccsr_gm20b.h> |
38 | #include <nvgpu/hw/gm20b/hw_ram_gm20b.h> | 39 | #include <nvgpu/hw/gm20b/hw_ram_gm20b.h> |
diff --git a/drivers/gpu/nvgpu/gm20b/fuse_gm20b.c b/drivers/gpu/nvgpu/gm20b/fuse_gm20b.c index 165d5b43..95ac8ee3 100644 --- a/drivers/gpu/nvgpu/gm20b/fuse_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/fuse_gm20b.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GM20B FUSE | 2 | * GM20B FUSE |
3 | * | 3 | * |
4 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * Permission is hereby granted, free of charge, to any person obtaining a | 6 | * Permission is hereby granted, free of charge, to any person obtaining a |
7 | * copy of this software and associated documentation files (the "Software"), | 7 | * copy of this software and associated documentation files (the "Software"), |
@@ -25,6 +25,7 @@ | |||
25 | #include <nvgpu/types.h> | 25 | #include <nvgpu/types.h> |
26 | #include <nvgpu/fuse.h> | 26 | #include <nvgpu/fuse.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 | 31 | ||
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c index 32ab58c1..6ee6afdb 100644 --- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <nvgpu/enabled.h> | 27 | #include <nvgpu/enabled.h> |
28 | #include <nvgpu/debug.h> | 28 | #include <nvgpu/debug.h> |
29 | #include <nvgpu/fuse.h> | 29 | #include <nvgpu/fuse.h> |
30 | #include <nvgpu/io.h> | ||
30 | 31 | ||
31 | #include "gk20a/gk20a.h" | 32 | #include "gk20a/gk20a.h" |
32 | #include "gk20a/gr_gk20a.h" | 33 | #include "gk20a/gr_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c index 9812c8d8..066e41f7 100644 --- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <nvgpu/enabled.h> | 28 | #include <nvgpu/enabled.h> |
29 | #include <nvgpu/bug.h> | 29 | #include <nvgpu/bug.h> |
30 | #include <nvgpu/ltc.h> | 30 | #include <nvgpu/ltc.h> |
31 | #include <nvgpu/io.h> | ||
31 | 32 | ||
32 | #include <nvgpu/hw/gm20b/hw_mc_gm20b.h> | 33 | #include <nvgpu/hw/gm20b/hw_mc_gm20b.h> |
33 | #include <nvgpu/hw/gm20b/hw_ltc_gm20b.h> | 34 | #include <nvgpu/hw/gm20b/hw_ltc_gm20b.h> |
diff --git a/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c b/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c index aa992c37..731078f7 100644 --- a/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <nvgpu/pmu.h> | 26 | #include <nvgpu/pmu.h> |
27 | #include <nvgpu/fuse.h> | 27 | #include <nvgpu/fuse.h> |
28 | #include <nvgpu/enabled.h> | 28 | #include <nvgpu/enabled.h> |
29 | #include <nvgpu/io.h> | ||
29 | 30 | ||
30 | #include "gk20a/gk20a.h" | 31 | #include "gk20a/gk20a.h" |
31 | #include "gk20a/pmu_gk20a.h" | 32 | #include "gk20a/pmu_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gm20b/therm_gm20b.c b/drivers/gpu/nvgpu/gm20b/therm_gm20b.c index dfe977ff..e2055376 100644 --- a/drivers/gpu/nvgpu/gm20b/therm_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/therm_gm20b.c | |||
@@ -22,6 +22,7 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/io.h> | ||
25 | #include "gk20a/gk20a.h" | 26 | #include "gk20a/gk20a.h" |
26 | 27 | ||
27 | #include "therm_gm20b.h" | 28 | #include "therm_gm20b.h" |