From 29df4f3da6232e9e3e8916d7b6d7587af7f92360 Mon Sep 17 00:00:00 2001
From: Alex Waterman <alexw@nvidia.com>
Date: Fri, 9 Mar 2018 13:07:39 -0800
Subject: 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>
---
 drivers/gpu/nvgpu/gp106/mclk_gp106.c       | 2 +-
 drivers/gpu/nvgpu/gp106/xve_gp106.h        | 1 +
 drivers/gpu/nvgpu/include/nvgpu/firmware.h | 2 ++
 drivers/gpu/nvgpu/include/nvgpu/fuse.h     | 2 ++
 drivers/gpu/nvgpu/include/nvgpu/soc.h      | 2 ++
 5 files changed, 8 insertions(+), 1 deletion(-)

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 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <linux/delay.h>
 #include <linux/pci_ids.h>
 
 #include <nvgpu/bios.h>
 #include <nvgpu/kmem.h>
+#include <nvgpu/timers.h>
 
 #include "gk20a/gk20a.h"
 #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 @@
 #include "gk20a/gk20a.h"
 
 #include <nvgpu/log2.h>
+#include <nvgpu/types.h>
 
 int gp106_init_xve_ops(struct gpu_ops *gops);
 
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 @@
 #ifndef _NVGPU_FIRMWARE_H_
 #define _NVGPU_FIRMWARE_H_
 
+#include <nvgpu/types.h>
+
 struct gk20a;
 
 #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 @@
 
 struct gk20a;
 
+#include <nvgpu/types.h>
+
 int nvgpu_tegra_get_gpu_speedo_id(struct gk20a *g);
 
 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 @@
 #ifndef __NVGPU_SOC_H__
 #define __NVGPU_SOC_H__
 
+#include <nvgpu/types.h>
+
 struct gk20a;
 
 bool nvgpu_platform_is_silicon(struct gk20a *g);
-- 
cgit v1.2.2