From 28476a5b13934f41dda2b96c2aa564c379890e51 Mon Sep 17 00:00:00 2001
From: Konsta Holtta <kholtta@nvidia.com>
Date: Mon, 29 Sep 2014 14:32:17 +0300
Subject: gpu: nvgpu: create new nvgpu ioctl header

Move nvgpu ioctls from the many user space interface headers to a new
single nvgpu.h header under include/uapi. No new code or replaced names
are introduced; this change only moves the definitions and changes
include directives accordingly.

Bug 1434573

Change-Id: I4d02415148e437a4e3edad221e08785fac377e91
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/542651
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
---
 drivers/gpu/nvgpu/gk20a/as_gk20a.c             | 2 +-
 drivers/gpu/nvgpu/gk20a/channel_gk20a.h        | 2 +-
 drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c           | 2 +-
 drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c        | 2 +-
 drivers/gpu/nvgpu/gk20a/gk20a.h                | 2 +-
 drivers/gpu/nvgpu/gk20a/gr_gk20a.c             | 2 +-
 drivers/gpu/nvgpu/gk20a/mm_gk20a.c             | 2 +-
 drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c | 2 +-
 drivers/gpu/nvgpu/gk20a/regops_gk20a.c         | 2 +-
 drivers/gpu/nvgpu/gk20a/regops_gk20a.h         | 2 +-
 drivers/gpu/nvgpu/gk20a/sync_gk20a.c           | 2 +-
 drivers/gpu/nvgpu/gk20a/tsg_gk20a.c            | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'drivers/gpu/nvgpu/gk20a')

diff --git a/drivers/gpu/nvgpu/gk20a/as_gk20a.c b/drivers/gpu/nvgpu/gk20a/as_gk20a.c
index c13d055e..ed7602f0 100644
--- a/drivers/gpu/nvgpu/gk20a/as_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/as_gk20a.c
@@ -20,7 +20,7 @@
 
 #include <trace/events/gk20a.h>
 
-#include <linux/nvhost_as_ioctl.h>
+#include <uapi/linux/nvgpu.h>
 
 #include "gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
index ff056140..a17e6ea9 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
@@ -22,7 +22,7 @@
 #include <linux/slab.h>
 #include <linux/wait.h>
 #include <linux/mutex.h>
-#include <linux/nvhost_ioctl.h>
+#include <uapi/linux/nvgpu.h>
 #include <linux/poll.h>
 
 struct gk20a;
diff --git a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
index 0feb92a5..746460c7 100644
--- a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
@@ -16,7 +16,7 @@
 
 #include <linux/highmem.h>
 #include <linux/cdev.h>
-#include <linux/nvhost_gpu_ioctl.h>
+#include <uapi/linux/nvgpu.h>
 
 #include "gk20a.h"
 #include "fence_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
index 2f1a08d8..40751b88 100644
--- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
@@ -21,7 +21,7 @@
 #include <linux/cdev.h>
 #include <linux/uaccess.h>
 #include <linux/nvhost.h>
-#include <linux/nvhost_dbg_gpu_ioctl.h>
+#include <uapi/linux/nvgpu.h>
 
 #include "gk20a.h"
 #include "gr_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 5429a570..6617f684 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -29,7 +29,7 @@ struct acr_gm20b;
 
 #include <linux/sched.h>
 #include <linux/spinlock.h>
-#include <linux/nvhost_gpu_ioctl.h>
+#include <uapi/linux/nvgpu.h>
 #include <linux/tegra-soc.h>
 
 #include "../../../arch/arm/mach-tegra/iomap.h"
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 11bca5bb..ca7294fd 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -21,7 +21,7 @@
 #include <linux/mm.h>		/* for totalram_pages */
 #include <linux/scatterlist.h>
 #include <linux/tegra-soc.h>
-#include <linux/nvhost_dbg_gpu_ioctl.h>
+#include <uapi/linux/nvgpu.h>
 #include <linux/vmalloc.h>
 #include <linux/dma-mapping.h>
 #include <linux/firmware.h>
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
index 37813ad3..e8e80a99 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
@@ -26,7 +26,7 @@
 #include <linux/tegra-soc.h>
 #include <linux/vmalloc.h>
 #include <linux/dma-buf.h>
-#include <linux/nvhost_as_ioctl.h>
+#include <uapi/linux/nvgpu.h>
 
 #include "gk20a.h"
 #include "mm_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
index d8a30d9a..0b4a03af 100644
--- a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
@@ -20,7 +20,7 @@
 #include <linux/debugfs.h>
 #include <linux/tegra-powergate.h>
 #include <linux/platform_data/tegra_edp.h>
-#include <linux/nvhost_ioctl.h>
+#include <uapi/linux/nvgpu.h>
 #include <linux/dma-buf.h>
 #include <linux/nvmap.h>
 #include <linux/tegra_pm_domains.h>
diff --git a/drivers/gpu/nvgpu/gk20a/regops_gk20a.c b/drivers/gpu/nvgpu/gk20a/regops_gk20a.c
index 0e1081b9..7adb458b 100644
--- a/drivers/gpu/nvgpu/gk20a/regops_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/regops_gk20a.c
@@ -19,7 +19,7 @@
 #include <linux/slab.h>
 #include <linux/err.h>
 #include <linux/bsearch.h>
-#include <linux/nvhost_dbg_gpu_ioctl.h>
+#include <uapi/linux/nvgpu.h>
 
 #include "gk20a.h"
 #include "gr_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/regops_gk20a.h b/drivers/gpu/nvgpu/gk20a/regops_gk20a.h
index 0c244f58..f53545e2 100644
--- a/drivers/gpu/nvgpu/gk20a/regops_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/regops_gk20a.h
@@ -18,7 +18,7 @@
 #ifndef REGOPS_GK20A_H
 #define REGOPS_GK20A_H
 
-#include <linux/nvhost_dbg_gpu_ioctl.h>
+#include <uapi/linux/nvgpu.h>
 
 struct regop_offset_range {
 	u32 base:24;
diff --git a/drivers/gpu/nvgpu/gk20a/sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/sync_gk20a.c
index abbf6aa8..9f6f4217 100644
--- a/drivers/gpu/nvgpu/gk20a/sync_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/sync_gk20a.c
@@ -21,7 +21,7 @@
 #include <linux/hrtimer.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/nvhost_ioctl.h>
+#include <uapi/linux/nvgpu.h>
 #include "../../../staging/android/sync.h"
 #include "semaphore_gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
index dedb4c8a..073ae680 100644
--- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
@@ -19,7 +19,7 @@
 #include <linux/cdev.h>
 #include <linux/uaccess.h>
 #include <linux/nvhost.h>
-#include <linux/nvhost_gpu_ioctl.h>
+#include <uapi/linux/nvgpu.h>
 #include <linux/anon_inodes.h>
 
 #include "gk20a.h"
-- 
cgit v1.2.2