diff options
author | Shashank Singh <shashsingh@nvidia.com> | 2017-10-12 01:26:55 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-10-17 07:28:29 -0400 |
commit | 682abd7b5cd544f83b8905830cd9b738c458be7f (patch) | |
tree | 60d8f968857d65d03057db48c09cc0416afa3713 /drivers/gpu | |
parent | 47fe66a461db349a884c4eed64a07377bbdb2a91 (diff) |
nvgpu: fix multiple build issues for QNX
- timers and bug header files should be
included directly. Linux maybe getting
it via indirect includes. Also, QNX
requires non-static function to be
declared explicitly.
Change-Id: I2458654f535d8079347e4a0be744530f56388238
Signed-off-by: Shashank Singh <shashsingh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1577527
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Sourab Gupta <sourabg@nvidia.com>
Tested-by: Sourab Gupta <sourabg@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu_ipc.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu_pg.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/flcn_gk20a.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/flcn_gk20a.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/falcon.h | 2 |
7 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu.c b/drivers/gpu/nvgpu/common/pmu/pmu.c index f0df6e14..95b57e22 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu.c | |||
@@ -26,6 +26,8 @@ | |||
26 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 26 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
27 | #include <nvgpu/enabled.h> | 27 | #include <nvgpu/enabled.h> |
28 | #include <nvgpu/barrier.h> | 28 | #include <nvgpu/barrier.h> |
29 | #include <nvgpu/timers.h> | ||
30 | #include <nvgpu/bug.h> | ||
29 | 31 | ||
30 | #include "gk20a/gk20a.h" | 32 | #include "gk20a/gk20a.h" |
31 | 33 | ||
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c b/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c index 80b41990..e76ed7df 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c | |||
@@ -23,6 +23,8 @@ | |||
23 | #include <nvgpu/enabled.h> | 23 | #include <nvgpu/enabled.h> |
24 | #include <nvgpu/pmu.h> | 24 | #include <nvgpu/pmu.h> |
25 | #include <nvgpu/log.h> | 25 | #include <nvgpu/log.h> |
26 | #include <nvgpu/timers.h> | ||
27 | #include <nvgpu/bug.h> | ||
26 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 28 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
27 | 29 | ||
28 | #include "gk20a/gk20a.h" | 30 | #include "gk20a/gk20a.h" |
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c b/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c index 873f5410..f0307d96 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <nvgpu/enabled.h> | 23 | #include <nvgpu/enabled.h> |
24 | #include <nvgpu/pmu.h> | 24 | #include <nvgpu/pmu.h> |
25 | #include <nvgpu/log.h> | 25 | #include <nvgpu/log.h> |
26 | #include <nvgpu/bug.h> | ||
26 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 27 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
27 | 28 | ||
28 | #include "gk20a/gk20a.h" | 29 | #include "gk20a/gk20a.h" |
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_pg.c b/drivers/gpu/nvgpu/common/pmu/pmu_pg.c index 49943884..b7f2cee8 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_pg.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_pg.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <nvgpu/log.h> | 24 | #include <nvgpu/log.h> |
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 | 28 | ||
28 | #include "gk20a/gk20a.h" | 29 | #include "gk20a/gk20a.h" |
29 | 30 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c b/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c index f926805d..b83d2dc0 100644 --- a/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <nvgpu/pmu.h> | 23 | #include <nvgpu/pmu.h> |
24 | 24 | ||
25 | #include "gk20a/gk20a.h" | 25 | #include "gk20a/gk20a.h" |
26 | #include "gk20a/flcn_gk20a.h" | ||
26 | 27 | ||
27 | #include <nvgpu/hw/gm20b/hw_falcon_gm20b.h> | 28 | #include <nvgpu/hw/gm20b/hw_falcon_gm20b.h> |
28 | 29 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/flcn_gk20a.h b/drivers/gpu/nvgpu/gk20a/flcn_gk20a.h index 6af0ef88..95d46251 100644 --- a/drivers/gpu/nvgpu/gk20a/flcn_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/flcn_gk20a.h | |||
@@ -24,5 +24,6 @@ | |||
24 | 24 | ||
25 | void gk20a_falcon_ops(struct nvgpu_falcon *flcn); | 25 | void gk20a_falcon_ops(struct nvgpu_falcon *flcn); |
26 | void gk20a_falcon_hal_sw_init(struct nvgpu_falcon *flcn); | 26 | void gk20a_falcon_hal_sw_init(struct nvgpu_falcon *flcn); |
27 | void gk20a_falcon_dump_stats(struct nvgpu_falcon *flcn); | ||
27 | 28 | ||
28 | #endif /* __FLCN_GK20A_H__ */ | 29 | #endif /* __FLCN_GK20A_H__ */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/falcon.h b/drivers/gpu/nvgpu/include/nvgpu/falcon.h index db0dd72b..72c74784 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/falcon.h +++ b/drivers/gpu/nvgpu/include/nvgpu/falcon.h | |||
@@ -192,6 +192,8 @@ int nvgpu_flcn_copy_to_dmem(struct nvgpu_falcon *flcn, | |||
192 | u32 dst, u8 *src, u32 size, u8 port); | 192 | u32 dst, u8 *src, u32 size, u8 port); |
193 | int nvgpu_flcn_copy_to_imem(struct nvgpu_falcon *flcn, | 193 | int nvgpu_flcn_copy_to_imem(struct nvgpu_falcon *flcn, |
194 | u32 dst, u8 *src, u32 size, u8 port, bool sec, u32 tag); | 194 | u32 dst, u8 *src, u32 size, u8 port, bool sec, u32 tag); |
195 | int nvgpu_flcn_copy_from_imem(struct nvgpu_falcon *flcn, | ||
196 | u32 src, u8 *dst, u32 size, u8 port); | ||
195 | int nvgpu_flcn_dma_copy(struct nvgpu_falcon *flcn, | 197 | int nvgpu_flcn_dma_copy(struct nvgpu_falcon *flcn, |
196 | struct nvgpu_falcon_dma_info *dma_info); | 198 | struct nvgpu_falcon_dma_info *dma_info); |
197 | u32 nvgpu_flcn_mailbox_read(struct nvgpu_falcon *flcn, u32 mailbox_index); | 199 | u32 nvgpu_flcn_mailbox_read(struct nvgpu_falcon *flcn, u32 mailbox_index); |