etnaviv: drm: Use mesa's ARRAY_SIZE

[mesa.git] / src / etnaviv / drm / etnaviv_priv.h

diff --git a/src/etnaviv/drm/etnaviv_priv.h b/src/etnaviv/drm/etnaviv_priv.h
index 8ae731fcc7030c75e8b266aaa8db140e2265dcda..027471bfd3df31b700a097350ae059df4cb94cc5 100644 (file)
--- a/src/etnaviv/drm/etnaviv_priv.h
+++ b/src/etnaviv/drm/etnaviv_priv.h
@@ -40,6 +40,10 @@
 
 #include <xf86drm.h>
 
 
 #include <xf86drm.h>
 

+#include "util/list.h"
+#include "util/macros.h"
+#include "util/u_atomic.h"
+

 #include "etnaviv_drmif.h"
 #include "etnaviv_drm.h"
 
 #include "etnaviv_drmif.h"
 #include "etnaviv_drm.h"
 


@@ -56,7 +60,7 @@ struct etna_bo_cache {
 
 struct etna_device {
        int fd;
 
 struct etna_device {
        int fd;

-       atomic_t refcnt;
+       int refcnt;

 
        /* tables to keep track of bo's, to avoid "evil-twin" etna_bo objects:
         *
 
        /* tables to keep track of bo's, to avoid "evil-twin" etna_bo objects:
         *


@@ -74,14 +78,14 @@ struct etna_device {
        int closefd;        /* call close(fd) upon destruction */
 };
 
        int closefd;        /* call close(fd) upon destruction */
 };
 

-drm_private void etna_bo_cache_init(struct etna_bo_cache *cache);
-drm_private void etna_bo_cache_cleanup(struct etna_bo_cache *cache, time_t time);
-drm_private struct etna_bo *etna_bo_cache_alloc(struct etna_bo_cache *cache,
+void etna_bo_cache_init(struct etna_bo_cache *cache);
+void etna_bo_cache_cleanup(struct etna_bo_cache *cache, time_t time);
+struct etna_bo *etna_bo_cache_alloc(struct etna_bo_cache *cache,

                uint32_t *size, uint32_t flags);
                uint32_t *size, uint32_t flags);

-drm_private int etna_bo_cache_free(struct etna_bo_cache *cache, struct etna_bo *bo);
+int etna_bo_cache_free(struct etna_bo_cache *cache, struct etna_bo *bo);

 
 /* for where @table_lock is already held: */
 
 /* for where @table_lock is already held: */

-drm_private void etna_device_del_locked(struct etna_device *dev);
+void etna_device_del_locked(struct etna_device *dev);

 
 /* a GEM buffer object allocated from the DRM device */
 struct etna_bo {
 
 /* a GEM buffer object allocated from the DRM device */
 struct etna_bo {


@@ -92,7 +96,7 @@ struct etna_bo {
        uint32_t        flags;
        uint32_t        name;           /* flink global handle (DRI2 name) */
        uint64_t        offset;         /* offset to mmap() */
        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
 
        /* 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,7 +177,6 @@ struct etna_perfmon_signal
 };
 
 #define ALIGN(v,a) (((v) + (a) - 1) & ~((a) - 1))
 };
 
 #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 1  /* TODO make dynamic */