diff options
author | Alex Waterman <alexw@nvidia.com> | 2018-03-09 16:07:39 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-03-30 17:54:12 -0400 |
commit | 29df4f3da6232e9e3e8916d7b6d7587af7f92360 (patch) | |
tree | 6d6e03ddb99d381ae6caf4c09d700157dd08a88c | |
parent | 12cd49a733f88c2d6ad41a5c411d1076f26956ed (diff) |
gpu: nvgpu: gp106 and missing types.h header fixes
Multiple places were missing explicit <nvgpu/types.h> includes but
used various types anyway. Fix that by including <nvgpu/types.h>
where necessary.
A gp106 file directly used the Linux delay header instead of
including <nvgpu/timers.h>.
This patch fixes both problems.
JIRA NVGPU-525
Change-Id: Ib7a30a8ed9098d469d646c0a2bba293087b8de90
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1673821
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Konsta Holtta <kholtta@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>
-rw-r--r-- | drivers/gpu/nvgpu/gp106/mclk_gp106.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/xve_gp106.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/firmware.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/fuse.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/soc.h | 2 |
5 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gp106/mclk_gp106.c b/drivers/gpu/nvgpu/gp106/mclk_gp106.c index 600f9c30..1e3e0de8 100644 --- a/drivers/gpu/nvgpu/gp106/mclk_gp106.c +++ b/drivers/gpu/nvgpu/gp106/mclk_gp106.c | |||
@@ -20,11 +20,11 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <linux/delay.h> | ||
24 | #include <linux/pci_ids.h> | 23 | #include <linux/pci_ids.h> |
25 | 24 | ||
26 | #include <nvgpu/bios.h> | 25 | #include <nvgpu/bios.h> |
27 | #include <nvgpu/kmem.h> | 26 | #include <nvgpu/kmem.h> |
27 | #include <nvgpu/timers.h> | ||
28 | 28 | ||
29 | #include "gk20a/gk20a.h" | 29 | #include "gk20a/gk20a.h" |
30 | #ifdef CONFIG_DEBUG_FS | 30 | #ifdef CONFIG_DEBUG_FS |
diff --git a/drivers/gpu/nvgpu/gp106/xve_gp106.h b/drivers/gpu/nvgpu/gp106/xve_gp106.h index 413dd8cd..d48b0991 100644 --- a/drivers/gpu/nvgpu/gp106/xve_gp106.h +++ b/drivers/gpu/nvgpu/gp106/xve_gp106.h | |||
@@ -26,6 +26,7 @@ | |||
26 | #include "gk20a/gk20a.h" | 26 | #include "gk20a/gk20a.h" |
27 | 27 | ||
28 | #include <nvgpu/log2.h> | 28 | #include <nvgpu/log2.h> |
29 | #include <nvgpu/types.h> | ||
29 | 30 | ||
30 | int gp106_init_xve_ops(struct gpu_ops *gops); | 31 | int gp106_init_xve_ops(struct gpu_ops *gops); |
31 | 32 | ||
diff --git a/drivers/gpu/nvgpu/include/nvgpu/firmware.h b/drivers/gpu/nvgpu/include/nvgpu/firmware.h index b541947a..cde897ed 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/firmware.h +++ b/drivers/gpu/nvgpu/include/nvgpu/firmware.h | |||
@@ -23,6 +23,8 @@ | |||
23 | #ifndef _NVGPU_FIRMWARE_H_ | 23 | #ifndef _NVGPU_FIRMWARE_H_ |
24 | #define _NVGPU_FIRMWARE_H_ | 24 | #define _NVGPU_FIRMWARE_H_ |
25 | 25 | ||
26 | #include <nvgpu/types.h> | ||
27 | |||
26 | struct gk20a; | 28 | struct gk20a; |
27 | 29 | ||
28 | #define NVGPU_REQUEST_FIRMWARE_NO_WARN (1UL << 0) | 30 | #define NVGPU_REQUEST_FIRMWARE_NO_WARN (1UL << 0) |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/fuse.h b/drivers/gpu/nvgpu/include/nvgpu/fuse.h index 15a656e4..fb04eef1 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/fuse.h +++ b/drivers/gpu/nvgpu/include/nvgpu/fuse.h | |||
@@ -24,6 +24,8 @@ | |||
24 | 24 | ||
25 | struct gk20a; | 25 | struct gk20a; |
26 | 26 | ||
27 | #include <nvgpu/types.h> | ||
28 | |||
27 | int nvgpu_tegra_get_gpu_speedo_id(struct gk20a *g); | 29 | int nvgpu_tegra_get_gpu_speedo_id(struct gk20a *g); |
28 | 30 | ||
29 | void nvgpu_tegra_fuse_write_bypass(struct gk20a *g, u32 val); | 31 | void nvgpu_tegra_fuse_write_bypass(struct gk20a *g, u32 val); |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/soc.h b/drivers/gpu/nvgpu/include/nvgpu/soc.h index f1b4f862..3a3490d2 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/soc.h +++ b/drivers/gpu/nvgpu/include/nvgpu/soc.h | |||
@@ -22,6 +22,8 @@ | |||
22 | #ifndef __NVGPU_SOC_H__ | 22 | #ifndef __NVGPU_SOC_H__ |
23 | #define __NVGPU_SOC_H__ | 23 | #define __NVGPU_SOC_H__ |
24 | 24 | ||
25 | #include <nvgpu/types.h> | ||
26 | |||
25 | struct gk20a; | 27 | struct gk20a; |
26 | 28 | ||
27 | bool nvgpu_platform_is_silicon(struct gk20a *g); | 29 | bool nvgpu_platform_is_silicon(struct gk20a *g); |