X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=src%2Fetnaviv%2Fdrm%2Fetnaviv_priv.h;h=4117be137716e347ca744733004f713a46c82f13;hp=aabace03f2b51bbbee9e5cb0fcccb1d4747207ca;hb=7a5b19346a48a4bea5a305684626e77972afbb71;hpb=6ab83b84749d91a886653ab6bcb51ad2d5040c07

diff --git a/src/etnaviv/drm/etnaviv_priv.h b/src/etnaviv/drm/etnaviv_priv.h
index aabace03f2b..4117be13771 100644
--- a/src/etnaviv/drm/etnaviv_priv.h
+++ b/src/etnaviv/drm/etnaviv_priv.h
@@ -40,8 +40,13 @@
 
 #include <xf86drm.h>
 
+#include "util/list.h"
+#include "util/macros.h"
+#include "util/u_atomic.h"
+#include "util/u_debug.h"
+
 #include "etnaviv_drmif.h"
-#include "etnaviv_drm.h"
+#include "drm-uapi/etnaviv_drm.h"
 
 struct etna_bo_bucket {
 	uint32_t size;
@@ -56,7 +61,7 @@ struct etna_bo_cache {
 
 struct etna_device {
 	int fd;
-	atomic_t refcnt;
+	int refcnt;
 
 	/* tables to keep track of bo's, to avoid "evil-twin" etna_bo objects:
 	 *
@@ -92,7 +97,7 @@ struct etna_bo {
 	uint32_t        flags;
 	uint32_t        name;           /* flink global handle (DRI2 name) */
 	uint64_t        offset;         /* offset to mmap() */
-	atomic_t        refcnt;
+	int		refcnt;
 
 	/* in the common case, a bo won't be referenced by more than a single
 	 * command stream.  So to avoid looping over all the bo's in the
@@ -173,21 +178,20 @@ struct etna_perfmon_signal
 };
 
 #define ALIGN(v,a) (((v) + (a) - 1) & ~((a) - 1))
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 
-#define enable_debug 1  /* TODO make dynamic */
+#define enable_debug 0  /* TODO make dynamic */
 
 #define INFO_MSG(fmt, ...) \
-		do { drmMsg("[I] "fmt " (%s:%d)\n", \
+		do { debug_printf("[I] "fmt " (%s:%d)\n", \
 				##__VA_ARGS__, __FUNCTION__, __LINE__); } while (0)
 #define DEBUG_MSG(fmt, ...) \
-		do if (enable_debug) { drmMsg("[D] "fmt " (%s:%d)\n", \
+		do if (enable_debug) { debug_printf("[D] "fmt " (%s:%d)\n", \
 				##__VA_ARGS__, __FUNCTION__, __LINE__); } while (0)
 #define WARN_MSG(fmt, ...) \
-		do { drmMsg("[W] "fmt " (%s:%d)\n", \
+		do { debug_printf("[W] "fmt " (%s:%d)\n", \
 				##__VA_ARGS__, __FUNCTION__, __LINE__); } while (0)
 #define ERROR_MSG(fmt, ...) \
-		do { drmMsg("[E] " fmt " (%s:%d)\n", \
+		do { debug_printf("[E] " fmt " (%s:%d)\n", \
 				##__VA_ARGS__, __FUNCTION__, __LINE__); } while (0)
 
 #define VOID2U64(x) ((uint64_t)(unsigned long)(x))