projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
etnaviv: drm: s/table_lock/etna_table_lock/
[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 aabace03f2b51bbbee9e5cb0fcccb1d4747207ca..527cee30dc31d4fd150186a86507f0ab2d1d19e0 100644
(file)
--- a/
src/etnaviv/drm/etnaviv_priv.h
+++ b/
src/etnaviv/drm/etnaviv_priv.h
@@
-40,8
+40,13
@@
#include <xf86drm.h>
#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_drmif.h"
-#include "etnaviv_drm.h"
+#include "
drm-uapi/
etnaviv_drm.h"
struct etna_bo_bucket {
uint32_t size;
struct etna_bo_bucket {
uint32_t size;
@@
-56,7
+61,7
@@
struct etna_bo_cache {
struct etna_device {
int fd;
struct etna_device {
int fd;
-
atomic_
t refcnt;
+
in
t 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:
*
@@
-80,7
+85,7
@@
struct etna_bo *etna_bo_cache_alloc(struct etna_bo_cache *cache,
uint32_t *size, uint32_t flags);
int etna_bo_cache_free(struct etna_bo_cache *cache, struct etna_bo *bo);
uint32_t *size, uint32_t flags);
int etna_bo_cache_free(struct etna_bo_cache *cache, struct etna_bo *bo);
-/* for where @table_lock is already held: */
+/* for where @
etna_drm_
table_lock is already held: */
void etna_device_del_locked(struct etna_device *dev);
/* a GEM buffer object allocated from the DRM device */
void etna_device_del_locked(struct etna_device *dev);
/* a GEM buffer object allocated from the DRM device */
@@
-92,7
+97,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,21
+178,20
@@
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
0
/* TODO make dynamic */
#define INFO_MSG(fmt, ...) \
#define INFO_MSG(fmt, ...) \
- do { d
rmMsg
("[I] "fmt " (%s:%d)\n", \
+ do { d
ebug_printf
("[I] "fmt " (%s:%d)\n", \
##__VA_ARGS__, __FUNCTION__, __LINE__); } while (0)
#define DEBUG_MSG(fmt, ...) \
##__VA_ARGS__, __FUNCTION__, __LINE__); } while (0)
#define DEBUG_MSG(fmt, ...) \
- do if (enable_debug) { d
rmMsg
("[D] "fmt " (%s:%d)\n", \
+ do if (enable_debug) { d
ebug_printf
("[D] "fmt " (%s:%d)\n", \
##__VA_ARGS__, __FUNCTION__, __LINE__); } while (0)
#define WARN_MSG(fmt, ...) \
##__VA_ARGS__, __FUNCTION__, __LINE__); } while (0)
#define WARN_MSG(fmt, ...) \
- do { d
rmMsg
("[W] "fmt " (%s:%d)\n", \
+ do { d
ebug_printf
("[W] "fmt " (%s:%d)\n", \
##__VA_ARGS__, __FUNCTION__, __LINE__); } while (0)
#define ERROR_MSG(fmt, ...) \
##__VA_ARGS__, __FUNCTION__, __LINE__); } while (0)
#define ERROR_MSG(fmt, ...) \
- do { d
rmMsg
("[E] " fmt " (%s:%d)\n", \
+ do { d
ebug_printf
("[E] " fmt " (%s:%d)\n", \
##__VA_ARGS__, __FUNCTION__, __LINE__); } while (0)
#define VOID2U64(x) ((uint64_t)(unsigned long)(x))
##__VA_ARGS__, __FUNCTION__, __LINE__); } while (0)
#define VOID2U64(x) ((uint64_t)(unsigned long)(x))