lib/i915: Split gem_create.c from ioctl_wrappers.c

In preparation for a variation on the exisiting GEM_CREATE API, split
the ioctl from out of the large ioctl_wrappers.c

Signed-off-by: Andrzej Turko <andrzej.turko@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

14 files changed, 34 insertions, 19 deletions

diff --git a/benchmarks/gem_blt.c b/benchmarks/gem_blt.c
index 5c6d28d3..34b82a87 100644
--- a/benchmarks/gem_blt.c
+++ b/benchmarks/gem_blt.c
@@ -41,6 +41,7 @@
 #include <time.h>
 
 #include "drm.h"
+#include "i915/gem.h"
 
 #define COPY_BLT_CMD		(2<<29|0x53<<22|0x6)
 #define BLT_WRITE_ALPHA		(1<<21)
diff --git a/benchmarks/gem_busy.c b/benchmarks/gem_busy.c
index 50410150..69be8c17 100644
--- a/benchmarks/gem_busy.c
+++ b/benchmarks/gem_busy.c
@@ -45,6 +45,7 @@
 #include "intel_chipset.h"
 #include "intel_reg.h"
 #include "igt_stats.h"
+#include "i915/gem.h"
 #include "i915/gem_mman.h"
 
 #define ENGINE_FLAGS  (I915_EXEC_RING_MASK | I915_EXEC_BSD_MASK)
diff --git a/benchmarks/gem_create.c b/benchmarks/gem_create.c
index 5dd996c9..d4e297ed 100644
--- a/benchmarks/gem_create.c
+++ b/benchmarks/gem_create.c
@@ -39,11 +39,12 @@
 #include <time.h>
 
 #include "drm.h"
-#include "ioctl_wrappers.h"
 #include "drmtest.h"
+#include "i915/gem.h"
 #include "igt_aux.h"
 #include "igt_stats.h"
 #include "intel_reg.h"
+#include "ioctl_wrappers.h"
 
 #define OBJECT_SIZE (1<<23)
 
diff --git a/benchmarks/gem_exec_ctx.c b/benchmarks/gem_exec_ctx.c
index a2e8d93e..b6f403fb 100644
--- a/benchmarks/gem_exec_ctx.c
+++ b/benchmarks/gem_exec_ctx.c
@@ -39,11 +39,12 @@
 #include <time.h>
 
 #include "drm.h"
-#include "ioctl_wrappers.h"
 #include "drmtest.h"
+#include "i915/gem.h"
 #include "intel_io.h"
 #include "intel_reg.h"
 #include "igt_stats.h"
+#include "ioctl_wrappers.h"
 
 enum mode { NOP, CREATE, SWITCH, DEFAULT };
 #define SYNC 0x1
diff --git a/benchmarks/gem_exec_fault.c b/benchmarks/gem_exec_fault.c
index 4bd05372..a3a0992c 100644
--- a/benchmarks/gem_exec_fault.c
+++ b/benchmarks/gem_exec_fault.c
@@ -41,11 +41,12 @@
 #include <time.h>
 
 #include "drm.h"
-#include "ioctl_wrappers.h"
 #include "drmtest.h"
+#include "i915/gem.h"
+#include "igt_stats.h"
 #include "intel_io.h"
 #include "intel_reg.h"
-#include "igt_stats.h"
+#include "ioctl_wrappers.h"
 
 #define ENGINE_FLAGS  (I915_EXEC_RING_MASK | I915_EXEC_BSD_MASK)
 
diff --git a/benchmarks/gem_exec_nop.c b/benchmarks/gem_exec_nop.c
index 0f17d232..c44d3454 100644
--- a/benchmarks/gem_exec_nop.c
+++ b/benchmarks/gem_exec_nop.c
@@ -39,11 +39,12 @@
 #include <time.h>
 
 #include "drm.h"
-#include "ioctl_wrappers.h"
 #include "drmtest.h"
+#include "i915/gem.h"
+#include "igt_stats.h"
 #include "intel_io.h"
 #include "intel_reg.h"
-#include "igt_stats.h"
+#include "ioctl_wrappers.h"
 
 #define ENGINE_FLAGS  (I915_EXEC_RING_MASK | I915_EXEC_BSD_MASK)
 
diff --git a/benchmarks/gem_exec_reloc.c b/benchmarks/gem_exec_reloc.c
index a0736b51..abaf9345 100644
--- a/benchmarks/gem_exec_reloc.c
+++ b/benchmarks/gem_exec_reloc.c
@@ -35,12 +35,14 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+
 #include "drm.h"
-#include "intel_reg.h"
-#include "ioctl_wrappers.h"
-#include "igt_debugfs.h"
 #include "drmtest.h"
+#include "i915/gem.h"
 #include "i915/gem_mman.h"
+#include "igt_debugfs.h"
+#include "intel_reg.h"
+#include "ioctl_wrappers.h"
 
 #define SKIP_RELOC 0x1
 #define NO_RELOC 0x2
diff --git a/benchmarks/gem_exec_trace.c b/benchmarks/gem_exec_trace.c
index 2724ee92..e37f6fb7 100644
--- a/benchmarks/gem_exec_trace.c
+++ b/benchmarks/gem_exec_trace.c
@@ -40,10 +40,11 @@
 #include <assert.h>
 
 #include "drm.h"
-#include "ioctl_wrappers.h"
 #include "drmtest.h"
-#include "intel_io.h"
+#include "i915/gem.h"
 #include "igt_stats.h"
+#include "intel_io.h"
+#include "ioctl_wrappers.h"
 
 enum {
 	ADD_BO = 0,
diff --git a/benchmarks/gem_latency.c b/benchmarks/gem_latency.c
index 774a33d3..9b3d22b7 100644
--- a/benchmarks/gem_latency.c
+++ b/benchmarks/gem_latency.c
@@ -41,8 +41,9 @@
 #include <sys/time.h>
 #include <sys/poll.h>
 #include <sys/resource.h>
-#include "drm.h"
 
+#include "drm.h"
+#include "i915/gem.h"
 #include "igt.h"
 #include "igt_device.h"
 
diff --git a/benchmarks/gem_prw.c b/benchmarks/gem_prw.c
index c2846040..5d3fda9a 100644
--- a/benchmarks/gem_prw.c
+++ b/benchmarks/gem_prw.c
@@ -39,10 +39,11 @@
 #include <time.h>
 
 #include "drm.h"
-#include "ioctl_wrappers.h"
 #include "drmtest.h"
+#include "i915/gem.h"
 #include "igt_aux.h"
 #include "igt_stats.h"
+#include "ioctl_wrappers.h"
 
 #define OBJECT_SIZE (1<<23)
 
diff --git a/benchmarks/gem_set_domain.c b/benchmarks/gem_set_domain.c
index afb410dc..1c9d797c 100644
--- a/benchmarks/gem_set_domain.c
+++ b/benchmarks/gem_set_domain.c
@@ -39,9 +39,10 @@
 #include <time.h>
 
 #include "drm.h"
-#include "ioctl_wrappers.h"
 #include "drmtest.h"
+#include "i915/gem.h"
 #include "igt_aux.h"
+#include "ioctl_wrappers.h"
 
 static double elapsed(const struct timespec *start,
 		      const struct timespec *end)
diff --git a/benchmarks/gem_syslatency.c b/benchmarks/gem_syslatency.c
index 9e57df3a..c10d4f50 100644
--- a/benchmarks/gem_syslatency.c
+++ b/benchmarks/gem_syslatency.c
@@ -44,6 +44,7 @@
 
 #include <linux/unistd.h>
 
+#include "i915/gem.h"
 #include "i915/gem_ring.h"
 
 #define sigev_notify_thread_id _sigev_un._tid
diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c
index 1c0c591e..1b66e63e 100644
--- a/benchmarks/gem_wsim.c
+++ b/benchmarks/gem_wsim.c
@@ -43,21 +43,22 @@
 #include <pthread.h>
 #include <math.h>
 
+#include "drm.h"
+#include "drmtest.h"
 #include "igt_device_scan.h"
 #include "intel_chipset.h"
 #include "intel_reg.h"
-#include "drm.h"
 #include "ioctl_wrappers.h"
-#include "drmtest.h"
 
 #include "intel_io.h"
 #include "igt_aux.h"
 #include "igt_rand.h"
 #include "igt_perf.h"
 #include "sw_sync.h"
-#include "i915/gem_mman.h"
 
+#include "i915/gem.h"
 #include "i915/gem_engine_topology.h"
+#include "i915/gem_mman.h"
 
 enum intel_engine_id {
 	DEFAULT,
diff --git a/benchmarks/prime_lookup.c b/benchmarks/prime_lookup.c
index d6c39729..b1891756 100644
--- a/benchmarks/prime_lookup.c
+++ b/benchmarks/prime_lookup.c
@@ -37,10 +37,11 @@
 #include <time.h>
 
 #include "drm.h"
-#include "ioctl_wrappers.h"
 #include "drmtest.h"
-#include "intel_io.h"
+#include "i915/gem.h"
 #include "igt_rand.h"
+#include "intel_io.h"
+#include "ioctl_wrappers.h"
 
 #define CLOSE_DEVICE 0x1