diff options
author | Shashank Singh <shashsingh@nvidia.com> | 2018-02-28 05:47:15 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-04-10 12:43:51 -0400 |
commit | e1200259ba3ad4ae416990b2f2abccb94565430f (patch) | |
tree | 4b53dbb0bc4787741b8c45a868026fd4960a204e | |
parent | d693952a0b52127f23093c28a2896a3fd395485b (diff) |
gpu: nvgpu: fix misc issue for dgpu code on QNX build
- QNX is pulling dgpu code from linux which has
multiple build failure on QNX. Like QNX needs
explicit declaration for all non-static functions.
Some linux specific headers need to be put under
__KERNEL__ flag.
Change-Id: I15af1a1f6a069c82f9a81449f4f7c7d48612de42
Signed-off-by: Shashank Singh <shashsingh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1665752
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/vidmem.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/flcn_gp106.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/fuse_gp106.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv100/mc_gv100.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv100/nvlink_gv100.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv100/pmu_gv100.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/lpwr/rppg.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/volt/volt_dev.c | 3 |
8 files changed, 12 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/common/mm/vidmem.c b/drivers/gpu/nvgpu/common/mm/vidmem.c index f534f45c..0fb423b6 100644 --- a/drivers/gpu/nvgpu/common/mm/vidmem.c +++ b/drivers/gpu/nvgpu/common/mm/vidmem.c | |||
@@ -20,8 +20,6 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <linux/scatterlist.h> | ||
24 | |||
25 | #include <nvgpu/bug.h> | 23 | #include <nvgpu/bug.h> |
26 | #include <nvgpu/timers.h> | 24 | #include <nvgpu/timers.h> |
27 | #include <nvgpu/dma.h> | 25 | #include <nvgpu/dma.h> |
diff --git a/drivers/gpu/nvgpu/gp106/flcn_gp106.c b/drivers/gpu/nvgpu/gp106/flcn_gp106.c index 7949edb7..f553f5e1 100644 --- a/drivers/gpu/nvgpu/gp106/flcn_gp106.c +++ b/drivers/gpu/nvgpu/gp106/flcn_gp106.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -22,6 +22,7 @@ | |||
22 | #include "gk20a/gk20a.h" | 22 | #include "gk20a/gk20a.h" |
23 | #include "gk20a/flcn_gk20a.h" | 23 | #include "gk20a/flcn_gk20a.h" |
24 | #include "gp106/sec2_gp106.h" | 24 | #include "gp106/sec2_gp106.h" |
25 | #include "gp106/flcn_gp106.h" | ||
25 | 26 | ||
26 | #include <nvgpu/hw/gp106/hw_falcon_gp106.h> | 27 | #include <nvgpu/hw/gp106/hw_falcon_gp106.h> |
27 | 28 | ||
diff --git a/drivers/gpu/nvgpu/gp106/fuse_gp106.c b/drivers/gpu/nvgpu/gp106/fuse_gp106.c index 68c0db89..0303830c 100644 --- a/drivers/gpu/nvgpu/gp106/fuse_gp106.c +++ b/drivers/gpu/nvgpu/gp106/fuse_gp106.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GP106 FUSE | 2 | * GP106 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/enabled.h> | 25 | #include <nvgpu/enabled.h> |
26 | 26 | ||
27 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
28 | #include "gp106/fuse_gp106.h" | ||
28 | 29 | ||
29 | int gp106_fuse_check_priv_security(struct gk20a *g) | 30 | int gp106_fuse_check_priv_security(struct gk20a *g) |
30 | { | 31 | { |
diff --git a/drivers/gpu/nvgpu/gv100/mc_gv100.c b/drivers/gpu/nvgpu/gv100/mc_gv100.c index a3f8ab06..5848a180 100644 --- a/drivers/gpu/nvgpu/gv100/mc_gv100.c +++ b/drivers/gpu/nvgpu/gv100/mc_gv100.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <linux/types.h> | 25 | #include <nvgpu/types.h> |
26 | 26 | ||
27 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
28 | 28 | ||
diff --git a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c index d0dfebcf..d27239ae 100644 --- a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c +++ b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c | |||
@@ -202,7 +202,7 @@ static const struct __nvlink_reginit __nvlink_reginit_per_link_gpu[] = { | |||
202 | 202 | ||
203 | #define NVL_DEVICE(str) nvlinkip_discovery_common_device_##str##_v() | 203 | #define NVL_DEVICE(str) nvlinkip_discovery_common_device_##str##_v() |
204 | 204 | ||
205 | const char * __gv100_device_type_to_str(u32 type) | 205 | static const char *__gv100_device_type_to_str(u32 type) |
206 | { | 206 | { |
207 | if (type == NVL_DEVICE(ioctrl)) | 207 | if (type == NVL_DEVICE(ioctrl)) |
208 | return "IOCTRL"; | 208 | return "IOCTRL"; |
@@ -1259,7 +1259,7 @@ static void gv100_nvlink_nvlipt_intr_enable(struct gk20a *g, u32 link_id, | |||
1259 | /* | 1259 | /* |
1260 | * Per-link NVLIPT ISR handler | 1260 | * Per-link NVLIPT ISR handler |
1261 | */ | 1261 | */ |
1262 | bool gv100_nvlink_nvlipt_isr(struct gk20a *g, u32 link_id) | 1262 | static bool gv100_nvlink_nvlipt_isr(struct gk20a *g, u32 link_id) |
1263 | { | 1263 | { |
1264 | /* | 1264 | /* |
1265 | * Interrupt handling happens in leaf handlers. Assume all interrupts | 1265 | * Interrupt handling happens in leaf handlers. Assume all interrupts |
diff --git a/drivers/gpu/nvgpu/gv100/pmu_gv100.c b/drivers/gpu/nvgpu/gv100/pmu_gv100.c index 113e554b..9317f6b4 100644 --- a/drivers/gpu/nvgpu/gv100/pmu_gv100.c +++ b/drivers/gpu/nvgpu/gv100/pmu_gv100.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <nvgpu/pmu.h> | 25 | #include <nvgpu/pmu.h> |
26 | 26 | ||
27 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
28 | #include "gv100/pmu_gv100.h" | ||
28 | 29 | ||
29 | int gv100_pmu_init_acr(struct gk20a *g) | 30 | int gv100_pmu_init_acr(struct gk20a *g) |
30 | { | 31 | { |
diff --git a/drivers/gpu/nvgpu/lpwr/rppg.c b/drivers/gpu/nvgpu/lpwr/rppg.c index 6fc86b2b..1613e33b 100644 --- a/drivers/gpu/nvgpu/lpwr/rppg.c +++ b/drivers/gpu/nvgpu/lpwr/rppg.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -25,6 +25,7 @@ | |||
25 | #include "gk20a/gk20a.h" | 25 | #include "gk20a/gk20a.h" |
26 | #include "gp106/bios_gp106.h" | 26 | #include "gp106/bios_gp106.h" |
27 | #include "pstate/pstate.h" | 27 | #include "pstate/pstate.h" |
28 | #include "lpwr/rppg.h" | ||
28 | 29 | ||
29 | static void pmu_handle_rppg_init_msg(struct gk20a *g, struct pmu_msg *msg, | 30 | static void pmu_handle_rppg_init_msg(struct gk20a *g, struct pmu_msg *msg, |
30 | void *param, u32 handle, u32 status) | 31 | void *param, u32 handle, u32 status) |
diff --git a/drivers/gpu/nvgpu/volt/volt_dev.c b/drivers/gpu/nvgpu/volt/volt_dev.c index 6ad658b8..38df2105 100644 --- a/drivers/gpu/nvgpu/volt/volt_dev.c +++ b/drivers/gpu/nvgpu/volt/volt_dev.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -20,6 +20,7 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/types.h> | ||
23 | #include <nvgpu/sort.h> | 24 | #include <nvgpu/sort.h> |
24 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 25 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
25 | #include <nvgpu/bios.h> | 26 | #include <nvgpu/bios.h> |