diff options
author | Vinod G <vinodg@nvidia.com> | 2018-07-25 18:17:01 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-08-10 21:11:26 -0400 |
commit | c9f8f1ea05f089567f497379ce372450c14895f8 (patch) | |
tree | e0558bdb7d647516a3bc1607b39e8488ab5aa321 /drivers/gpu/nvgpu/common | |
parent | 84c0ab81ab28b349c5477b0512b8bbfdb24edc3d (diff) |
gpu: nvgpu: remove utils.h from gk20a.h
Removed the utils.h include from gk20a.h
utils.h is included in those files which
make use of the macros in utils.h
JIRA NVGPU-1005
Change-Id: Ifb41da58db6ff8682fa6b5dfdd8eda11a751fcac
Signed-off-by: Vinod G <vinodg@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1785952
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
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/ce2.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 | 1 | ||||
-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/fifo/submit.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu_fw.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu_pg.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/sim.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/sim_pci.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/xve/xve_gp106.c | 1 |
12 files changed, 14 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/common/ce2.c b/drivers/gpu/nvgpu/common/ce2.c index 9385b531..d4793ef6 100644 --- a/drivers/gpu/nvgpu/common/ce2.c +++ b/drivers/gpu/nvgpu/common/ce2.c | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #include <nvgpu/types.h> | 23 | #include <nvgpu/types.h> |
24 | #include <nvgpu/channel.h> | 24 | #include <nvgpu/channel.h> |
25 | #include <nvgpu/utils.h> | ||
25 | 26 | ||
26 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> | 27 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> |
27 | 28 | ||
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gk20a.c b/drivers/gpu/nvgpu/common/fb/fb_gk20a.c index 14634923..903bb983 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gk20a.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gk20a.c | |||
@@ -30,6 +30,7 @@ | |||
30 | 30 | ||
31 | #include <nvgpu/timers.h> | 31 | #include <nvgpu/timers.h> |
32 | #include <nvgpu/io.h> | 32 | #include <nvgpu/io.h> |
33 | #include <nvgpu/utils.h> | ||
33 | 34 | ||
34 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> | 35 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> |
35 | #include <nvgpu/hw/gk20a/hw_fb_gk20a.h> | 36 | #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 00ae7b5f..9f207771 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gm20b.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c | |||
@@ -23,6 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/sizes.h> | 25 | #include <nvgpu/sizes.h> |
26 | #include <nvgpu/utils.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
28 | 29 | ||
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gv100.c b/drivers/gpu/nvgpu/common/fb/fb_gv100.c index 8857f02b..e68062c0 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gv100.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gv100.c | |||
@@ -36,6 +36,7 @@ | |||
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 | #include <nvgpu/io.h> |
39 | #include <nvgpu/utils.h> | ||
39 | 40 | ||
40 | #include "gk20a/gk20a.h" | 41 | #include "gk20a/gk20a.h" |
41 | #include "gm20b/acr_gm20b.h" | 42 | #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 6973e04d..b6121f4d 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c | |||
@@ -31,6 +31,7 @@ | |||
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 | #include <nvgpu/io.h> |
34 | #include <nvgpu/utils.h> | ||
34 | 35 | ||
35 | #include "gk20a/gk20a.h" | 36 | #include "gk20a/gk20a.h" |
36 | #include "gk20a/mm_gk20a.h" | 37 | #include "gk20a/mm_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/common/fifo/submit.c b/drivers/gpu/nvgpu/common/fifo/submit.c index 00763036..d034f2d3 100644 --- a/drivers/gpu/nvgpu/common/fifo/submit.c +++ b/drivers/gpu/nvgpu/common/fifo/submit.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <nvgpu/channel.h> | 23 | #include <nvgpu/channel.h> |
24 | #include <nvgpu/ltc.h> | 24 | #include <nvgpu/ltc.h> |
25 | #include <nvgpu/os_sched.h> | 25 | #include <nvgpu/os_sched.h> |
26 | #include <nvgpu/utils.h> | ||
26 | 27 | ||
27 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> | 28 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> |
28 | 29 | ||
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu.c b/drivers/gpu/nvgpu/common/pmu/pmu.c index 2dcadb48..c71928c3 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <nvgpu/barrier.h> | 28 | #include <nvgpu/barrier.h> |
29 | #include <nvgpu/timers.h> | 29 | #include <nvgpu/timers.h> |
30 | #include <nvgpu/bug.h> | 30 | #include <nvgpu/bug.h> |
31 | #include <nvgpu/utils.h> | ||
31 | 32 | ||
32 | #include "gk20a/gk20a.h" | 33 | #include "gk20a/gk20a.h" |
33 | 34 | ||
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_fw.c b/drivers/gpu/nvgpu/common/pmu/pmu_fw.c index fc328401..a5ad6cb5 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_fw.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_fw.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 26 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
27 | #include <nvgpu/firmware.h> | 27 | #include <nvgpu/firmware.h> |
28 | #include <nvgpu/enabled.h> | 28 | #include <nvgpu/enabled.h> |
29 | #include <nvgpu/utils.h> | ||
29 | 30 | ||
30 | #include "gk20a/gk20a.h" | 31 | #include "gk20a/gk20a.h" |
31 | 32 | ||
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_pg.c b/drivers/gpu/nvgpu/common/pmu/pmu_pg.c index 30bf9008..c8559fdb 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_pg.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_pg.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 25 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
26 | #include <nvgpu/barrier.h> | 26 | #include <nvgpu/barrier.h> |
27 | #include <nvgpu/bug.h> | 27 | #include <nvgpu/bug.h> |
28 | #include <nvgpu/utils.h> | ||
28 | 29 | ||
29 | #include "gk20a/gk20a.h" | 30 | #include "gk20a/gk20a.h" |
30 | 31 | ||
diff --git a/drivers/gpu/nvgpu/common/sim.c b/drivers/gpu/nvgpu/common/sim.c index c46f0959..8261f270 100644 --- a/drivers/gpu/nvgpu/common/sim.c +++ b/drivers/gpu/nvgpu/common/sim.c | |||
@@ -27,6 +27,8 @@ | |||
27 | #include <nvgpu/io.h> | 27 | #include <nvgpu/io.h> |
28 | #include <nvgpu/hw_sim.h> | 28 | #include <nvgpu/hw_sim.h> |
29 | #include <nvgpu/sim.h> | 29 | #include <nvgpu/sim.h> |
30 | #include <nvgpu/utils.h> | ||
31 | |||
30 | #include "gk20a/gk20a.h" | 32 | #include "gk20a/gk20a.h" |
31 | 33 | ||
32 | int nvgpu_alloc_sim_buffer(struct gk20a *g, struct nvgpu_mem *mem) | 34 | int nvgpu_alloc_sim_buffer(struct gk20a *g, struct nvgpu_mem *mem) |
diff --git a/drivers/gpu/nvgpu/common/sim_pci.c b/drivers/gpu/nvgpu/common/sim_pci.c index 65950c4c..edf2a401 100644 --- a/drivers/gpu/nvgpu/common/sim_pci.c +++ b/drivers/gpu/nvgpu/common/sim_pci.c | |||
@@ -26,6 +26,8 @@ | |||
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 <nvgpu/io.h> |
29 | #include <nvgpu/utils.h> | ||
30 | |||
29 | #include "gk20a/gk20a.h" | 31 | #include "gk20a/gk20a.h" |
30 | 32 | ||
31 | static inline u32 sim_msg_header_size(void) | 33 | static inline u32 sim_msg_header_size(void) |
diff --git a/drivers/gpu/nvgpu/common/xve/xve_gp106.c b/drivers/gpu/nvgpu/common/xve/xve_gp106.c index 6cfbc9d9..5e662ee0 100644 --- a/drivers/gpu/nvgpu/common/xve/xve_gp106.c +++ b/drivers/gpu/nvgpu/common/xve/xve_gp106.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <nvgpu/bug.h> | 26 | #include <nvgpu/bug.h> |
27 | #include <nvgpu/xve.h> | 27 | #include <nvgpu/xve.h> |
28 | #include <nvgpu/io.h> | 28 | #include <nvgpu/io.h> |
29 | #include <nvgpu/utils.h> | ||
29 | 30 | ||
30 | #include "xve_gp106.h" | 31 | #include "xve_gp106.h" |
31 | 32 | ||