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/gv11b | |
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/gv11b')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/acr_gv11b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/ce_gv11b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/ecc_gv11b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gv11b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gv11b.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/mm_gv11b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/pmu_gv11b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/regops_gv11b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/subctx_gv11b.c | 6 |
15 files changed, 18 insertions, 19 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/acr_gv11b.c b/drivers/gpu/nvgpu/gv11b/acr_gv11b.c index e27c1760..c7b854bf 100644 --- a/drivers/gpu/nvgpu/gv11b/acr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/acr_gv11b.c | |||
@@ -33,8 +33,8 @@ | |||
33 | #include <nvgpu/enabled.h> | 33 | #include <nvgpu/enabled.h> |
34 | #include <nvgpu/io.h> | 34 | #include <nvgpu/io.h> |
35 | #include <nvgpu/utils.h> | 35 | #include <nvgpu/utils.h> |
36 | #include <nvgpu/gk20a.h> | ||
36 | 37 | ||
37 | #include "gk20a/gk20a.h" | ||
38 | #include "acr_gv11b.h" | 38 | #include "acr_gv11b.h" |
39 | #include "pmu_gv11b.h" | 39 | #include "pmu_gv11b.h" |
40 | #include "gm20b/mm_gm20b.h" | 40 | #include "gm20b/mm_gm20b.h" |
diff --git a/drivers/gpu/nvgpu/gv11b/ce_gv11b.c b/drivers/gpu/nvgpu/gv11b/ce_gv11b.c index 0183aff0..2eea11df 100644 --- a/drivers/gpu/nvgpu/gv11b/ce_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/ce_gv11b.c | |||
@@ -25,8 +25,7 @@ | |||
25 | #include <nvgpu/io.h> | 25 | #include <nvgpu/io.h> |
26 | #include "nvgpu/log.h" | 26 | #include "nvgpu/log.h" |
27 | #include "nvgpu/bitops.h" | 27 | #include "nvgpu/bitops.h" |
28 | 28 | #include <nvgpu/gk20a.h> | |
29 | #include "gk20a/gk20a.h" | ||
30 | 29 | ||
31 | #include "gp10b/ce_gp10b.h" | 30 | #include "gp10b/ce_gp10b.h" |
32 | 31 | ||
diff --git a/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c index 4707ab31..1191dad3 100644 --- a/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c | |||
@@ -35,9 +35,9 @@ | |||
35 | #include <nvgpu/dma.h> | 35 | #include <nvgpu/dma.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 | #include <nvgpu/channel.h> | 39 | #include <nvgpu/channel.h> |
39 | 40 | ||
40 | #include "gk20a/gk20a.h" | ||
41 | #include "gk20a/css_gr_gk20a.h" | 41 | #include "gk20a/css_gr_gk20a.h" |
42 | #include "css_gr_gv11b.h" | 42 | #include "css_gr_gv11b.h" |
43 | 43 | ||
diff --git a/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c b/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c index 85db7aea..ec6cce55 100644 --- a/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c | |||
@@ -25,8 +25,8 @@ | |||
25 | #include <nvgpu/log.h> | 25 | #include <nvgpu/log.h> |
26 | #include <nvgpu/io.h> | 26 | #include <nvgpu/io.h> |
27 | #include <nvgpu/utils.h> | 27 | #include <nvgpu/utils.h> |
28 | #include <nvgpu/gk20a.h> | ||
28 | 29 | ||
29 | #include "gk20a/gk20a.h" | ||
30 | #include "gv11b/dbg_gpu_gv11b.h" | 30 | #include "gv11b/dbg_gpu_gv11b.h" |
31 | #include <nvgpu/hw/gv11b/hw_perf_gv11b.h> | 31 | #include <nvgpu/hw/gv11b/hw_perf_gv11b.h> |
32 | #include <nvgpu/hw/gv11b/hw_mc_gv11b.h> | 32 | #include <nvgpu/hw/gv11b/hw_mc_gv11b.h> |
diff --git a/drivers/gpu/nvgpu/gv11b/ecc_gv11b.c b/drivers/gpu/nvgpu/gv11b/ecc_gv11b.c index 6e29bf94..07937042 100644 --- a/drivers/gpu/nvgpu/gv11b/ecc_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/ecc_gv11b.c | |||
@@ -21,8 +21,8 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/ecc.h> | 23 | #include <nvgpu/ecc.h> |
24 | #include <nvgpu/gk20a.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "gv11b/ecc_gv11b.h" | 26 | #include "gv11b/ecc_gv11b.h" |
27 | 27 | ||
28 | int gv11b_ecc_init(struct gk20a *g) | 28 | int gv11b_ecc_init(struct gk20a *g) |
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c index 4632d3f8..fa1836c8 100644 --- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | |||
@@ -39,9 +39,9 @@ | |||
39 | #include <nvgpu/ptimer.h> | 39 | #include <nvgpu/ptimer.h> |
40 | #include <nvgpu/io.h> | 40 | #include <nvgpu/io.h> |
41 | #include <nvgpu/utils.h> | 41 | #include <nvgpu/utils.h> |
42 | #include <nvgpu/gk20a.h> | ||
42 | #include <nvgpu/channel.h> | 43 | #include <nvgpu/channel.h> |
43 | 44 | ||
44 | #include "gk20a/gk20a.h" | ||
45 | #include "gk20a/fifo_gk20a.h" | 45 | #include "gk20a/fifo_gk20a.h" |
46 | 46 | ||
47 | #include "gp10b/fifo_gp10b.h" | 47 | #include "gp10b/fifo_gp10b.h" |
diff --git a/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.c index 514aadb1..9ac54192 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * DEALINGS IN THE SOFTWARE. | 23 | * DEALINGS IN THE SOFTWARE. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "gk20a/gk20a.h" | 26 | #include <nvgpu/gk20a.h> |
27 | 27 | ||
28 | #include "gr_ctx_gv11b.h" | 28 | #include "gr_ctx_gv11b.h" |
29 | 29 | ||
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index 2596d400..78cb1b98 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c | |||
@@ -35,9 +35,9 @@ | |||
35 | #include <nvgpu/io.h> | 35 | #include <nvgpu/io.h> |
36 | #include <nvgpu/utils.h> | 36 | #include <nvgpu/utils.h> |
37 | #include <nvgpu/bitops.h> | 37 | #include <nvgpu/bitops.h> |
38 | #include <nvgpu/gk20a.h> | ||
38 | #include <nvgpu/channel.h> | 39 | #include <nvgpu/channel.h> |
39 | 40 | ||
40 | #include "gk20a/gk20a.h" | ||
41 | #include "gk20a/gr_gk20a.h" | 41 | #include "gk20a/gr_gk20a.h" |
42 | #include "gk20a/dbg_gpu_gk20a.h" | 42 | #include "gk20a/dbg_gpu_gk20a.h" |
43 | #include "gk20a/regops_gk20a.h" | 43 | #include "gk20a/regops_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gv11b/gv11b.c b/drivers/gpu/nvgpu/gv11b/gv11b.c index 5d2bfbd7..db146095 100644 --- a/drivers/gpu/nvgpu/gv11b/gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gv11b.c | |||
@@ -23,8 +23,8 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/enabled.h> | 25 | #include <nvgpu/enabled.h> |
26 | #include <nvgpu/gk20a.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | ||
28 | #include "gv11b/gv11b.h" | 28 | #include "gv11b/gv11b.h" |
29 | 29 | ||
30 | int gv11b_init_gpu_characteristics(struct gk20a *g) | 30 | int gv11b_init_gpu_characteristics(struct gk20a *g) |
diff --git a/drivers/gpu/nvgpu/gv11b/gv11b.h b/drivers/gpu/nvgpu/gv11b/gv11b.h index 3d5490e6..c6ecf141 100644 --- a/drivers/gpu/nvgpu/gv11b/gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/gv11b.h | |||
@@ -25,7 +25,7 @@ | |||
25 | #ifndef GV11B_H | 25 | #ifndef GV11B_H |
26 | #define GV11B_H | 26 | #define GV11B_H |
27 | 27 | ||
28 | #include "gk20a/gk20a.h" | 28 | #include <nvgpu/gk20a.h> |
29 | 29 | ||
30 | int gv11b_init_gpu_characteristics(struct gk20a *g); | 30 | int gv11b_init_gpu_characteristics(struct gk20a *g); |
31 | 31 | ||
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 91122fba..479b06d1 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |||
@@ -21,6 +21,7 @@ | |||
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/gk20a.h> | ||
24 | 25 | ||
25 | #include "common/bus/bus_gk20a.h" | 26 | #include "common/bus/bus_gk20a.h" |
26 | #include "common/bus/bus_gp10b.h" | 27 | #include "common/bus/bus_gp10b.h" |
@@ -44,7 +45,6 @@ | |||
44 | #include "common/mc/mc_gp10b.h" | 45 | #include "common/mc/mc_gp10b.h" |
45 | #include "common/mc/mc_gv11b.h" | 46 | #include "common/mc/mc_gv11b.h" |
46 | 47 | ||
47 | #include "gk20a/gk20a.h" | ||
48 | #include "gk20a/fifo_gk20a.h" | 48 | #include "gk20a/fifo_gk20a.h" |
49 | #include "gk20a/fecs_trace_gk20a.h" | 49 | #include "gk20a/fecs_trace_gk20a.h" |
50 | #include "gk20a/css_gr_gk20a.h" | 50 | #include "gk20a/css_gr_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gv11b/mm_gv11b.c b/drivers/gpu/nvgpu/gv11b/mm_gv11b.c index 5d5aed94..8027d165 100644 --- a/drivers/gpu/nvgpu/gv11b/mm_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/mm_gv11b.c | |||
@@ -27,8 +27,8 @@ | |||
27 | #include <nvgpu/log.h> | 27 | #include <nvgpu/log.h> |
28 | #include <nvgpu/mm.h> | 28 | #include <nvgpu/mm.h> |
29 | #include <nvgpu/enabled.h> | 29 | #include <nvgpu/enabled.h> |
30 | #include <nvgpu/gk20a.h> | ||
30 | 31 | ||
31 | #include "gk20a/gk20a.h" | ||
32 | #include "gk20a/mm_gk20a.h" | 32 | #include "gk20a/mm_gk20a.h" |
33 | 33 | ||
34 | #include "gp10b/mm_gp10b.h" | 34 | #include "gp10b/mm_gp10b.h" |
diff --git a/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c b/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c index 60ffdb98..a9f183b1 100644 --- a/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c | |||
@@ -28,8 +28,7 @@ | |||
28 | #include <nvgpu/mm.h> | 28 | #include <nvgpu/mm.h> |
29 | #include <nvgpu/io.h> | 29 | #include <nvgpu/io.h> |
30 | #include <nvgpu/utils.h> | 30 | #include <nvgpu/utils.h> |
31 | 31 | #include <nvgpu/gk20a.h> | |
32 | #include "gk20a/gk20a.h" | ||
33 | 32 | ||
34 | #include "gp10b/pmu_gp10b.h" | 33 | #include "gp10b/pmu_gp10b.h" |
35 | #include "gp106/pmu_gp106.h" | 34 | #include "gp106/pmu_gp106.h" |
diff --git a/drivers/gpu/nvgpu/gv11b/regops_gv11b.c b/drivers/gpu/nvgpu/gv11b/regops_gv11b.c index 0bc8ab05..13386a4a 100644 --- a/drivers/gpu/nvgpu/gv11b/regops_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/regops_gv11b.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_gv11b.h" | 28 | #include "regops_gv11b.h" |
28 | 29 | ||
diff --git a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c index 25626cd4..499a00a8 100644 --- a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c | |||
@@ -22,9 +22,7 @@ | |||
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 | |||
27 | #include "gv11b/subctx_gv11b.h" | ||
28 | 26 | ||
29 | #include <nvgpu/dma.h> | 27 | #include <nvgpu/dma.h> |
30 | #include <nvgpu/log.h> | 28 | #include <nvgpu/log.h> |
@@ -36,6 +34,8 @@ | |||
36 | #include <nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h> | 34 | #include <nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h> |
37 | #include <nvgpu/hw/gv11b/hw_gr_gv11b.h> | 35 | #include <nvgpu/hw/gv11b/hw_gr_gv11b.h> |
38 | 36 | ||
37 | #include "gv11b/subctx_gv11b.h" | ||
38 | |||
39 | static void gv11b_subctx_commit_valid_mask(struct vm_gk20a *vm, | 39 | static void gv11b_subctx_commit_valid_mask(struct vm_gk20a *vm, |
40 | struct nvgpu_mem *inst_block); | 40 | struct nvgpu_mem *inst_block); |
41 | static void gv11b_subctx_commit_pdb(struct vm_gk20a *vm, | 41 | static void gv11b_subctx_commit_pdb(struct vm_gk20a *vm, |