etnaviv: arrange include files consistently

Arrange the order of include files consistently:
- C library includes
- Xorg includes
- our includes
- etnaviv includes
- etnaviv_compat.h include

Signed-off-by: Russell King <rmk@armlinux.org.uk>

11 files changed, 49 insertions, 38 deletions

diff --git a/etnaviv/Makefile.am b/etnaviv/Makefile.am
index fe69566..d082f52 100644
--- a/etnaviv/Makefile.am
+++ b/etnaviv/Makefile.am
@@ -23,6 +23,7 @@ ETNA_COMMON_SOURCES = \
 	etnaviv_accel.c \
 	etnaviv_accel.h \
 	etnaviv_compat.h \
+	etnaviv_compat_xorg.h \
 	etnaviv_op.c \
 	etnaviv_op.h \
 	etnaviv_render.c \
diff --git a/etnaviv/etnadrm.c b/etnaviv/etnadrm.c
index ce82fe9..1f08ad4 100644
--- a/etnaviv/etnadrm.c
+++ b/etnaviv/etnadrm.c
@@ -10,19 +10,19 @@
 #include <sys/mman.h>
 #include <xf86.h>
 #include <xf86drm.h>
-#include <etnaviv/viv.h>
-#include <etnaviv/etna.h>
-#include <etnaviv/etna_bo.h>
-
-#include <etnaviv/state.xml.h>
 
 #include "bo-cache.h"
 #include "etnadrm.h"
 #include "etnaviv_drm.h"
-#include "etnaviv_compat.h"
 #include "compat-list.h"
 #include "utils.h"
 
+#include <etnaviv/viv.h>
+#include <etnaviv/etna.h>
+#include <etnaviv/etna_bo.h>
+#include <etnaviv/state.xml.h>
+#include "etnaviv_compat.h"
+
 struct etna_viv_conn {
 	struct viv_conn conn;
 	struct bo_cache cache;
diff --git a/etnaviv/etnadrm.h b/etnaviv/etnadrm.h
index 8ad17b7..ae6bcbc 100644
--- a/etnaviv/etnadrm.h
+++ b/etnaviv/etnadrm.h
@@ -3,13 +3,10 @@
 
 struct etna_bo;
 struct etna_ctx;
+struct viv_conn;
 
 void etna_emit_reloc(struct etna_ctx *ctx, uint32_t buf_offset,
 	struct etna_bo *mem, uint32_t offset, Bool write);
 int etnadrm_open_render(const char *name);
 
-int etna_bo_flink(struct etna_bo *bo, uint32_t *name);
-int etna_bo_to_dmabuf(struct viv_conn *conn, struct etna_bo *mem);
-struct etna_bo *etna_bo_from_name(struct viv_conn *conn, uint32_t name);
-
 #endif
diff --git a/etnaviv/etnaviv.c b/etnaviv/etnaviv.c
index a737f2b..669dc6e 100644
--- a/etnaviv/etnaviv.c
+++ b/etnaviv/etnaviv.c
@@ -28,9 +28,6 @@
 #include "xf86.h"
 #include "compat-api.h"
 
-#include <etnaviv/etna.h>
-#include <etnaviv/state_2d.xml.h>
-
 #include "cpu_access.h"
 #include "fbutil.h"
 #include "gal_extension.h"
@@ -45,6 +42,10 @@
 #include "etnaviv_utils.h"
 #include "etnaviv_xv.h"
 
+#include <etnaviv/etna.h>
+#include <etnaviv/state_2d.xml.h>
+#include "etnaviv_compat.h"
+
 etnaviv_Key etnaviv_pixmap_index;
 etnaviv_Key etnaviv_screen_index;
 int etnaviv_private_index = -1;
diff --git a/etnaviv/etnaviv_accel.h b/etnaviv/etnaviv_accel.h
index bc25a75..425e85b 100644
--- a/etnaviv/etnaviv_accel.h
+++ b/etnaviv/etnaviv_accel.h
@@ -7,13 +7,14 @@
 #ifndef VIVANTE_ACCEL_H
 #define VIVANTE_ACCEL_H
 
-#include <etnaviv/viv.h>
-#include <etnaviv/etna.h>
-#include <etnaviv/etna_bo.h>
 #include "compat-list.h"
 #include "pixmaputil.h"
-#include "etnaviv_compat.h"
 #include "etnaviv_op.h"
+#include "etnaviv_compat_xorg.h"
+
+#include <etnaviv/viv.h>
+#include <etnaviv/etna.h>
+#include <etnaviv/etna_bo.h>
 
 struct armada_accel_ops;
 struct drm_armada_bo;
diff --git a/etnaviv/etnaviv_compat.h b/etnaviv/etnaviv_compat.h
index 6181691..a6050a3 100644
--- a/etnaviv/etnaviv_compat.h
+++ b/etnaviv/etnaviv_compat.h
@@ -4,20 +4,8 @@
  * Written by Russell King, 2012, derived in part from the
  * Intel xorg X server driver.
  */
-#ifndef VIVANTE_COMPAT_H
-#define VIVANTE_COMPAT_H
-
-#include "utils.h"
-
-#if HAS_DEVPRIVATEKEYREC
-#define etnaviv_CreateKey(key, type) dixRegisterPrivateKey(key, type, 0)
-#define etnaviv_GetKeyPriv(dp, key)  dixGetPrivate(dp, key)
-#define etnaviv_Key                  DevPrivateKeyRec
-#else
-#define etnaviv_CreateKey(key, type) dixRequestPrivate(key, 0)
-#define etnaviv_GetKeyPriv(dp, key)  dixLookupPrivate(dp, key)
-#define etnaviv_Key                  int
-#endif
+#ifndef ETNAVIV_COMPAT_H
+#define ETNAVIV_COMPAT_H
 
 /*
  * Etnaviv itself does not provide these functions.  We'd like these
diff --git a/etnaviv/etnaviv_compat_xorg.h b/etnaviv/etnaviv_compat_xorg.h
new file mode 100644
index 0000000..47a529a
--- /dev/null
+++ b/etnaviv/etnaviv_compat_xorg.h
@@ -0,0 +1,20 @@
+/*
+ * Vivante GPU Acceleration Xorg driver
+ *
+ * Written by Russell King, 2012, derived in part from the
+ * Intel xorg X server driver.
+ */
+#ifndef ETNAVIV_COMPAT_XORG_H
+#define ETNAVIV_COMPAT_XORG_H
+
+#if HAS_DEVPRIVATEKEYREC
+#define etnaviv_CreateKey(key, type) dixRegisterPrivateKey(key, type, 0)
+#define etnaviv_GetKeyPriv(dp, key)  dixGetPrivate(dp, key)
+#define etnaviv_Key                  DevPrivateKeyRec
+#else
+#define etnaviv_CreateKey(key, type) dixRequestPrivate(key, 0)
+#define etnaviv_GetKeyPriv(dp, key)  dixLookupPrivate(dp, key)
+#define etnaviv_Key                  int
+#endif
+
+#endif
diff --git a/etnaviv/etnaviv_dri3.c b/etnaviv/etnaviv_dri3.c
index 85a2baa..f4bece4 100644
--- a/etnaviv/etnaviv_dri3.c
+++ b/etnaviv/etnaviv_dri3.c
@@ -26,11 +26,12 @@
 #include "misyncshm.h"
 #include "compat-api.h"
 
-#include <etnaviv/etna.h>
-
 #include "etnaviv_accel.h"
 #include "etnaviv_dri3.h"
 
+#include <etnaviv/etna.h>
+#include "etnaviv_compat.h"
+
 static Bool etnaviv_dri3_authorise(struct etnaviv *etnaviv, int fd)
 {
 	struct stat st;
diff --git a/etnaviv/etnaviv_render.c b/etnaviv/etnaviv_render.c
index c3d2608..699e1d1 100644
--- a/etnaviv/etnaviv_render.c
+++ b/etnaviv/etnaviv_render.c
@@ -14,8 +14,6 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
-#include <etnaviv/state_2d.xml.h>
-
 #ifdef HAVE_DIX_CONFIG_H
 #include "dix-config.h"
 #endif
@@ -38,6 +36,8 @@
 #include "etnaviv_accel.h"
 #include "etnaviv_render.h"
 #include "etnaviv_utils.h"
+
+#include <etnaviv/state_2d.xml.h>
 #include "etnaviv_compat.h"
 
 struct etnaviv_composite_state {
diff --git a/etnaviv/etnaviv_utils.c b/etnaviv/etnaviv_utils.c
index 0a2d1dd..ea8c7b9 100644
--- a/etnaviv/etnaviv_utils.c
+++ b/etnaviv/etnaviv_utils.c
@@ -21,7 +21,6 @@
 #include "xf86.h"
 
 #include <armada_bufmgr.h>
-#include <etnaviv/state_2d.xml.h>
 #include "cpu_access.h"
 #include "gal_extension.h"
 #include "pamdump.h"
@@ -29,6 +28,8 @@
 
 #include "etnaviv_accel.h"
 #include "etnaviv_utils.h"
+
+#include <etnaviv/state_2d.xml.h>
 #include "etnaviv_compat.h"
 
 static const char *etnaviv_errors[] = {
diff --git a/etnaviv/etnaviv_xv.c b/etnaviv/etnaviv_xv.c
index f11521d..f290d64 100644
--- a/etnaviv/etnaviv_xv.c
+++ b/etnaviv/etnaviv_xv.c
@@ -37,8 +37,9 @@
 #include "etnaviv_utils.h"
 #include "etnaviv_xv.h"
 
-#include "etnaviv/etna_bo.h"
-#include "etnaviv/state_2d.xml.h"
+#include <etnaviv/etna_bo.h>
+#include <etnaviv/state_2d.xml.h>
+#include "etnaviv_compat.h"
 
 /*
  * The Vivante GPU supports up to 32k x 32k, but that would be