From fd2cac59f3491cb5b4f5d1f3fc97df94734bd682 Mon Sep 17 00:00:00 2001
From: Terje Bergstrom <tbergstrom@nvidia.com>
Date: Fri, 10 Nov 2017 11:38:41 -0800
Subject: [PATCH] gpu: nvgpu: Include UAPI explicitly

Add explicit #includes for <uapi/linux/nvgpu.h> for source code files
that depend on it.

JIRA NVGPU-259

Change-Id: I717d5f1493423fd3a7a34b6dd3380d33a9307a09
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1596254
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/common/as.c              | 1 +
 drivers/gpu/nvgpu/common/linux/cde.c       | 1 +
 drivers/gpu/nvgpu/common/linux/ce2.c       | 2 ++
 drivers/gpu/nvgpu/common/linux/channel.c   | 1 +
 drivers/gpu/nvgpu/common/linux/clk_arb.c   | 1 +
 drivers/gpu/nvgpu/common/linux/vidmem.c    | 1 +
 drivers/gpu/nvgpu/common/mm/gmmu.c         | 2 ++
 drivers/gpu/nvgpu/common/mm/vm.c           | 2 ++
 drivers/gpu/nvgpu/common/mm/vm_area.c      | 2 ++
 drivers/gpu/nvgpu/gk20a/channel_gk20a.c    | 1 +
 drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c    | 2 ++
 drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c | 1 +
 drivers/gpu/nvgpu/gk20a/fifo_gk20a.c       | 1 +
 drivers/gpu/nvgpu/gk20a/gr_gk20a.c         | 1 +
 drivers/gpu/nvgpu/gk20a/pmu_gk20a.c        | 2 ++
 drivers/gpu/nvgpu/gk20a/tsg_gk20a.c        | 2 ++
 drivers/gpu/nvgpu/gm20b/gr_gm20b.c         | 2 ++
 drivers/gpu/nvgpu/gp106/gr_gp106.c         | 2 ++
 drivers/gpu/nvgpu/gp10b/fifo_gp10b.c       | 2 ++
 drivers/gpu/nvgpu/gp10b/gr_gp10b.c         | 1 +
 drivers/gpu/nvgpu/vgpu/css_vgpu.c          | 1 +
 drivers/gpu/nvgpu/vgpu/dbg_vgpu.c          | 1 +
 drivers/gpu/nvgpu/vgpu/fifo_vgpu.c         | 1 +
 drivers/gpu/nvgpu/vgpu/gr_vgpu.c           | 2 ++
 drivers/gpu/nvgpu/vgpu/mm_vgpu.c           | 1 +
 drivers/gpu/nvgpu/vgpu/vgpu.c              | 1 +
 26 files changed, 37 insertions(+)

diff --git a/drivers/gpu/nvgpu/common/as.c b/drivers/gpu/nvgpu/common/as.c
index f4f00fba3..7ca754e1d 100644
--- a/drivers/gpu/nvgpu/common/as.c
+++ b/drivers/gpu/nvgpu/common/as.c
@@ -23,6 +23,7 @@
  */
 
 #include <trace/events/gk20a.h>
+#include <uapi/linux/nvgpu.h>
 
 #include <nvgpu/kmem.h>
 #include <nvgpu/vm.h>
diff --git a/drivers/gpu/nvgpu/common/linux/cde.c b/drivers/gpu/nvgpu/common/linux/cde.c
index 8e847206e..143e5b75c 100644
--- a/drivers/gpu/nvgpu/common/linux/cde.c
+++ b/drivers/gpu/nvgpu/common/linux/cde.c
@@ -19,6 +19,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/fs.h>
 #include <linux/dma-buf.h>
+#include <uapi/linux/nvgpu.h>
 
 #include <trace/events/gk20a.h>
 
diff --git a/drivers/gpu/nvgpu/common/linux/ce2.c b/drivers/gpu/nvgpu/common/linux/ce2.c
index 5f89ef7be..f172cedeb 100644
--- a/drivers/gpu/nvgpu/common/linux/ce2.c
+++ b/drivers/gpu/nvgpu/common/linux/ce2.c
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <uapi/linux/nvgpu.h>
+
 #include <nvgpu/types.h>
 
 #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>
diff --git a/drivers/gpu/nvgpu/common/linux/channel.c b/drivers/gpu/nvgpu/common/linux/channel.c
index c295336f7..40b11b86b 100644
--- a/drivers/gpu/nvgpu/common/linux/channel.c
+++ b/drivers/gpu/nvgpu/common/linux/channel.c
@@ -32,6 +32,7 @@
 #include <linux/uaccess.h>
 #include <linux/dma-buf.h>
 #include <trace/events/gk20a.h>
+#include <uapi/linux/nvgpu.h>
 
 u32 nvgpu_get_gpfifo_entry_size(void)
 {
diff --git a/drivers/gpu/nvgpu/common/linux/clk_arb.c b/drivers/gpu/nvgpu/common/linux/clk_arb.c
index ff26f567c..ef89f9802 100644
--- a/drivers/gpu/nvgpu/common/linux/clk_arb.c
+++ b/drivers/gpu/nvgpu/common/linux/clk_arb.c
@@ -31,6 +31,7 @@
 #ifdef CONFIG_DEBUG_FS
 #include <linux/debugfs.h>
 #endif
+#include <uapi/linux/nvgpu.h>
 
 #include <nvgpu/bitops.h>
 #include <nvgpu/lock.h>
diff --git a/drivers/gpu/nvgpu/common/linux/vidmem.c b/drivers/gpu/nvgpu/common/linux/vidmem.c
index 1e65b54d0..1d9fea714 100644
--- a/drivers/gpu/nvgpu/common/linux/vidmem.c
+++ b/drivers/gpu/nvgpu/common/linux/vidmem.c
@@ -15,6 +15,7 @@
  */
 
 #include <linux/dma-buf.h>
+#include <uapi/linux/nvgpu.h>
 
 #include <linux/platform/tegra/tegra_fd.h>
 
diff --git a/drivers/gpu/nvgpu/common/mm/gmmu.c b/drivers/gpu/nvgpu/common/mm/gmmu.c
index 4289104d9..568da8c4f 100644
--- a/drivers/gpu/nvgpu/common/mm/gmmu.c
+++ b/drivers/gpu/nvgpu/common/mm/gmmu.c
@@ -20,6 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <uapi/linux/nvgpu.h>
+
 #include <nvgpu/log.h>
 #include <nvgpu/list.h>
 #include <nvgpu/dma.h>
diff --git a/drivers/gpu/nvgpu/common/mm/vm.c b/drivers/gpu/nvgpu/common/mm/vm.c
index 97c6d4ca2..cfac4f8ef 100644
--- a/drivers/gpu/nvgpu/common/mm/vm.c
+++ b/drivers/gpu/nvgpu/common/mm/vm.c
@@ -21,6 +21,8 @@
  */
 
 #include <nvgpu/bug.h>
+#include <uapi/linux/nvgpu.h>
+
 #include <nvgpu/log.h>
 #include <nvgpu/dma.h>
 #include <nvgpu/vm.h>
diff --git a/drivers/gpu/nvgpu/common/mm/vm_area.c b/drivers/gpu/nvgpu/common/mm/vm_area.c
index fddec357d..b6286c438 100644
--- a/drivers/gpu/nvgpu/common/mm/vm_area.c
+++ b/drivers/gpu/nvgpu/common/mm/vm_area.c
@@ -20,6 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <uapi/linux/nvgpu.h>
+
 #include <nvgpu/vm.h>
 #include <nvgpu/vm_area.h>
 
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 9a8130ba0..4be232f19 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -23,6 +23,7 @@
  */
 
 #include <trace/events/gk20a.h>
+#include <uapi/linux/nvgpu.h>
 
 #if defined(CONFIG_DEBUG_FS) || defined(CONFIG_GK20A_CYCLE_STATS)
 #include <linux/dma-buf.h>
diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
index fd31ab894..cf04e116d 100644
--- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
@@ -22,6 +22,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <uapi/linux/nvgpu.h>
+
 #include <nvgpu/kmem.h>
 #include <nvgpu/log.h>
 #include <nvgpu/vm.h>
diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
index cd206c2a3..d283a82e0 100644
--- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
@@ -24,6 +24,7 @@
 #ifdef CONFIG_DEBUG_FS
 #include <linux/debugfs.h>
 #endif
+#include <uapi/linux/nvgpu.h>
 
 #include <nvgpu/kmem.h>
 #include <nvgpu/dma.h>
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index 061ceba19..424b16951 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -23,6 +23,7 @@
  */
 
 #include <trace/events/gk20a.h>
+#include <uapi/linux/nvgpu.h>
 
 #include <nvgpu/mm.h>
 #include <nvgpu/dma.h>
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 5c13fec2a..fc0081695 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -23,6 +23,7 @@
  */
 
 #include <trace/events/gk20a.h>
+#include <uapi/linux/nvgpu.h>
 
 #include <nvgpu/dma.h>
 #include <nvgpu/kmem.h>
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index 2b954e1ad..d8478b2d6 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -22,6 +22,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <uapi/linux/nvgpu.h>
+
 #include <nvgpu/nvgpu_common.h>
 #include <nvgpu/timers.h>
 #include <nvgpu/kmem.h>
diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
index 640174a60..5af01a058 100644
--- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
@@ -20,6 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <uapi/linux/nvgpu.h>
+
 #include <nvgpu/kmem.h>
 #include <nvgpu/log.h>
 
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index c692d975b..20f8e0623 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -22,6 +22,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <uapi/linux/nvgpu.h>
+
 #include <nvgpu/kmem.h>
 #include <nvgpu/log.h>
 #include <nvgpu/enabled.h>
diff --git a/drivers/gpu/nvgpu/gp106/gr_gp106.c b/drivers/gpu/nvgpu/gp106/gr_gp106.c
index 9c1dc0c56..1fb527d16 100644
--- a/drivers/gpu/nvgpu/gp106/gr_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/gr_gp106.c
@@ -22,6 +22,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <uapi/linux/nvgpu.h>
+
 #include <nvgpu/dma.h>
 
 #include "gk20a/gk20a.h"
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
index accbe0a64..1c9249d19 100644
--- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
@@ -22,6 +22,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <uapi/linux/nvgpu.h>
+
 #include <nvgpu/dma.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/log2.h>
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index c9b2f8591..559ea1598 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -24,6 +24,7 @@
 
 #include <dt-bindings/soc/gm20b-fuse.h>
 #include <dt-bindings/soc/gp10b-fuse.h>
+#include <uapi/linux/nvgpu.h>
 
 #include <nvgpu/timers.h>
 #include <nvgpu/kmem.h>
diff --git a/drivers/gpu/nvgpu/vgpu/css_vgpu.c b/drivers/gpu/nvgpu/vgpu/css_vgpu.c
index 357d119df..7362fc6f3 100644
--- a/drivers/gpu/nvgpu/vgpu/css_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/css_vgpu.c
@@ -23,6 +23,7 @@
 
 #include <linux/tegra-ivc.h>
 #include <linux/tegra_vgpu.h>
+#include <uapi/linux/nvgpu.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/channel_gk20a.h"
diff --git a/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c b/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c
index 0ed66eb96..4879c2eba 100644
--- a/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c
@@ -22,6 +22,7 @@
 
 #include <linux/tegra_gr_comm.h>
 #include <linux/tegra_vgpu.h>
+#include <uapi/linux/nvgpu.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/channel_gk20a.h"
diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
index 149a51c01..fa9388f24 100644
--- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
@@ -24,6 +24,7 @@
 
 #include <linux/dma-mapping.h>
 #include <trace/events/gk20a.h>
+#include <uapi/linux/nvgpu.h>
 
 #include <nvgpu/kmem.h>
 #include <nvgpu/dma.h>
diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
index 730f4b224..5dc6f68ea 100644
--- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
@@ -22,6 +22,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <uapi/linux/nvgpu.h>
+
 #include <nvgpu/kmem.h>
 #include <nvgpu/bug.h>
 
diff --git a/drivers/gpu/nvgpu/vgpu/mm_vgpu.c b/drivers/gpu/nvgpu/vgpu/mm_vgpu.c
index a125366a4..79d15d10a 100644
--- a/drivers/gpu/nvgpu/vgpu/mm_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/mm_vgpu.c
@@ -23,6 +23,7 @@
  */
 
 #include <linux/dma-mapping.h>
+#include <uapi/linux/nvgpu.h>
 
 #include <nvgpu/kmem.h>
 #include <nvgpu/dma.h>
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c
index 4a85ee718..6a9e986b2 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.c
@@ -27,6 +27,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/pm_qos.h>
 #include <soc/tegra/chip-id.h>
+#include <uapi/linux/nvgpu.h>
 
 #include <nvgpu/kmem.h>
 #include <nvgpu/bug.h>