diff options
author | ddutta <ddutta@nvidia.com> | 2018-09-14 07:20:24 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-09-14 18:35:12 -0400 |
commit | 8381eeea4f9b4717854387068ddf9244973e7d0d (patch) | |
tree | 189a5fe544f9e9cf3f59a51e906a009192006654 /drivers/gpu/nvgpu/gm20b | |
parent | 998c59883453388f9e4a8eb391b7604c069154a6 (diff) |
gpu: nvgpu: change location of gk20a.h#include <nvgpu/gk20a.h>
Update the include location of gk20a.h to include/nvgpu/gk20a.h in the
following directories.
nvgpu/gm20b/
nvgpu/gp10b/
nvgpu/gv11b/
Jira NVGPU-597
Change-Id: Ie38d4a72bb65c41bd30058350509bfa7e87bb64e
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1822789
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
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 | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/clk_gm20b.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/fifo_gm20b.c | 10 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/gr_ctx_gm20b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/gr_gm20b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 15 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/mm_gm20b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/pmu_gm20b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/regops_gm20b.c | 3 |
9 files changed, 23 insertions, 23 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c index 24112dd3..be05a8a8 100644 --- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c | |||
@@ -35,8 +35,8 @@ | |||
35 | #include <nvgpu/mm.h> | 35 | #include <nvgpu/mm.h> |
36 | #include <nvgpu/io.h> | 36 | #include <nvgpu/io.h> |
37 | #include <nvgpu/utils.h> | 37 | #include <nvgpu/utils.h> |
38 | #include <nvgpu/gk20a.h> | ||
38 | 39 | ||
39 | #include "gk20a/gk20a.h" | ||
40 | #include "mm_gm20b.h" | 40 | #include "mm_gm20b.h" |
41 | #include "acr_gm20b.h" | 41 | #include "acr_gm20b.h" |
42 | 42 | ||
diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c index d2260d9c..31a14c0c 100644 --- a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c | |||
@@ -22,9 +22,6 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "clk_gm20b.h" | ||
27 | |||
28 | #include <nvgpu/soc.h> | 25 | #include <nvgpu/soc.h> |
29 | #include <nvgpu/fuse.h> | 26 | #include <nvgpu/fuse.h> |
30 | #include <nvgpu/bug.h> | 27 | #include <nvgpu/bug.h> |
@@ -33,6 +30,9 @@ | |||
33 | #include <nvgpu/io.h> | 30 | #include <nvgpu/io.h> |
34 | #include <nvgpu/utils.h> | 31 | #include <nvgpu/utils.h> |
35 | #include <nvgpu/timers.h> | 32 | #include <nvgpu/timers.h> |
33 | #include <nvgpu/gk20a.h> | ||
34 | |||
35 | #include "clk_gm20b.h" | ||
36 | 36 | ||
37 | #include <nvgpu/hw/gm20b/hw_trim_gm20b.h> | 37 | #include <nvgpu/hw/gm20b/hw_trim_gm20b.h> |
38 | #include <nvgpu/hw/gm20b/hw_therm_gm20b.h> | 38 | #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 19653541..f866b6bb 100644 --- a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c | |||
@@ -22,11 +22,6 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "gk20a/fifo_gk20a.h" | ||
27 | |||
28 | #include "fifo_gm20b.h" | ||
29 | |||
30 | #include <nvgpu/timers.h> | 25 | #include <nvgpu/timers.h> |
31 | #include <nvgpu/log.h> | 26 | #include <nvgpu/log.h> |
32 | #include <nvgpu/atomic.h> | 27 | #include <nvgpu/atomic.h> |
@@ -35,8 +30,13 @@ | |||
35 | #include <nvgpu/enabled.h> | 30 | #include <nvgpu/enabled.h> |
36 | #include <nvgpu/io.h> | 31 | #include <nvgpu/io.h> |
37 | #include <nvgpu/bug.h> | 32 | #include <nvgpu/bug.h> |
33 | #include <nvgpu/gk20a.h> | ||
38 | #include <nvgpu/channel.h> | 34 | #include <nvgpu/channel.h> |
39 | 35 | ||
36 | #include "gk20a/fifo_gk20a.h" | ||
37 | |||
38 | #include "fifo_gm20b.h" | ||
39 | |||
40 | #include <nvgpu/hw/gm20b/hw_ccsr_gm20b.h> | 40 | #include <nvgpu/hw/gm20b/hw_ccsr_gm20b.h> |
41 | #include <nvgpu/hw/gm20b/hw_ram_gm20b.h> | 41 | #include <nvgpu/hw/gm20b/hw_ram_gm20b.h> |
42 | #include <nvgpu/hw/gm20b/hw_fifo_gm20b.h> | 42 | #include <nvgpu/hw/gm20b/hw_fifo_gm20b.h> |
diff --git a/drivers/gpu/nvgpu/gm20b/gr_ctx_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_ctx_gm20b.c index cd7433b3..8c9c4c92 100644 --- a/drivers/gpu/nvgpu/gm20b/gr_ctx_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/gr_ctx_gm20b.c | |||
@@ -24,7 +24,8 @@ | |||
24 | * DEALINGS IN THE SOFTWARE. | 24 | * DEALINGS IN THE SOFTWARE. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "gk20a/gk20a.h" | 27 | #include <nvgpu/gk20a.h> |
28 | |||
28 | #include "gr_ctx_gm20b.h" | 29 | #include "gr_ctx_gm20b.h" |
29 | 30 | ||
30 | int gr_gm20b_get_netlist_name(struct gk20a *g, int index, char *name) | 31 | int gr_gm20b_get_netlist_name(struct gk20a *g, int index, char *name) |
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c index 32e98e53..200f58a3 100644 --- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c | |||
@@ -29,9 +29,9 @@ | |||
29 | #include <nvgpu/fuse.h> | 29 | #include <nvgpu/fuse.h> |
30 | #include <nvgpu/io.h> | 30 | #include <nvgpu/io.h> |
31 | #include <nvgpu/utils.h> | 31 | #include <nvgpu/utils.h> |
32 | #include <nvgpu/gk20a.h> | ||
32 | #include <nvgpu/channel.h> | 33 | #include <nvgpu/channel.h> |
33 | 34 | ||
34 | #include "gk20a/gk20a.h" | ||
35 | #include "gk20a/gr_gk20a.h" | 35 | #include "gk20a/gr_gk20a.h" |
36 | 36 | ||
37 | #include "gr_gm20b.h" | 37 | #include "gr_gm20b.h" |
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index f863aa72..772a4a85 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c | |||
@@ -21,6 +21,13 @@ | |||
21 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 21 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | #include <nvgpu/debug.h> | ||
25 | #include <nvgpu/bug.h> | ||
26 | #include <nvgpu/enabled.h> | ||
27 | #include <nvgpu/ptimer.h> | ||
28 | #include <nvgpu/error_notifier.h> | ||
29 | #include <nvgpu/gk20a.h> | ||
30 | #include <nvgpu/channel.h> | ||
24 | 31 | ||
25 | #include "common/clock_gating/gm20b_gating_reglist.h" | 32 | #include "common/clock_gating/gm20b_gating_reglist.h" |
26 | #include "common/bus/bus_gm20b.h" | 33 | #include "common/bus/bus_gm20b.h" |
@@ -34,7 +41,6 @@ | |||
34 | #include "common/fuse/fuse_gm20b.h" | 41 | #include "common/fuse/fuse_gm20b.h" |
35 | #include "common/mc/mc_gm20b.h" | 42 | #include "common/mc/mc_gm20b.h" |
36 | 43 | ||
37 | #include "gk20a/gk20a.h" | ||
38 | #include "gk20a/ce2_gk20a.h" | 44 | #include "gk20a/ce2_gk20a.h" |
39 | #include "gk20a/dbg_gpu_gk20a.h" | 45 | #include "gk20a/dbg_gpu_gk20a.h" |
40 | #include "gk20a/fifo_gk20a.h" | 46 | #include "gk20a/fifo_gk20a.h" |
@@ -56,13 +62,6 @@ | |||
56 | #include "hal_gm20b.h" | 62 | #include "hal_gm20b.h" |
57 | #include "acr_gm20b.h" | 63 | #include "acr_gm20b.h" |
58 | 64 | ||
59 | #include <nvgpu/debug.h> | ||
60 | #include <nvgpu/bug.h> | ||
61 | #include <nvgpu/enabled.h> | ||
62 | #include <nvgpu/ptimer.h> | ||
63 | #include <nvgpu/error_notifier.h> | ||
64 | #include <nvgpu/channel.h> | ||
65 | |||
66 | #include <nvgpu/hw/gm20b/hw_proj_gm20b.h> | 65 | #include <nvgpu/hw/gm20b/hw_proj_gm20b.h> |
67 | #include <nvgpu/hw/gm20b/hw_fifo_gm20b.h> | 66 | #include <nvgpu/hw/gm20b/hw_fifo_gm20b.h> |
68 | #include <nvgpu/hw/gm20b/hw_ram_gm20b.h> | 67 | #include <nvgpu/hw/gm20b/hw_ram_gm20b.h> |
diff --git a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c index dbaaacc5..23dec6c0 100644 --- a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c | |||
@@ -23,8 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/sizes.h> | 25 | #include <nvgpu/sizes.h> |
26 | 26 | #include <nvgpu/gk20a.h> | |
27 | #include "gk20a/gk20a.h" | ||
28 | 27 | ||
29 | #include "mm_gm20b.h" | 28 | #include "mm_gm20b.h" |
30 | 29 | ||
diff --git a/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c b/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c index a46f8807..c1ec4d8e 100644 --- a/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c | |||
@@ -27,8 +27,8 @@ | |||
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 | #include <nvgpu/io.h> |
30 | #include <nvgpu/gk20a.h> | ||
30 | 31 | ||
31 | #include "gk20a/gk20a.h" | ||
32 | #include "gk20a/pmu_gk20a.h" | 32 | #include "gk20a/pmu_gk20a.h" |
33 | 33 | ||
34 | #include "acr_gm20b.h" | 34 | #include "acr_gm20b.h" |
diff --git a/drivers/gpu/nvgpu/gm20b/regops_gm20b.c b/drivers/gpu/nvgpu/gm20b/regops_gm20b.c index ab865b68..2a74ab73 100644 --- a/drivers/gpu/nvgpu/gm20b/regops_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/regops_gm20b.c | |||
@@ -22,7 +22,8 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "gk20a/gk20a.h" | 25 | #include <nvgpu/gk20a.h> |
26 | |||
26 | #include "gk20a/regops_gk20a.h" | 27 | #include "gk20a/regops_gk20a.h" |
27 | #include "regops_gm20b.h" | 28 | #include "regops_gm20b.h" |
28 | 29 | ||