AndroidIA: Added support for Travis CI

[android-x86/external-minigbm.git] / drv_priv.h

diff --git a/drv_priv.h b/drv_priv.h
index a195e0e..6aa3f83 100644 (file)
--- a/drv_priv.h
+++ b/drv_priv.h
@@ -7,13 +7,26 @@
 #ifndef DRV_PRIV_H
 #define DRV_PRIV_H
 
-#include <pthread.h>
+
 #include <stdint.h>
 #include <stdlib.h>
 #include <sys/types.h>
+#include <stdatomic.h>
 
 #include "drv.h"
 
+#ifndef DISABLE_LOCK
+#define ATOMIC_LOCK(X) \
+while (atomic_flag_test_and_set(X)) { \
+  }
+
+#define ATOMIC_UNLOCK(X) \
+  atomic_flag_clear(X);
+#else
+#define ATOMIC_LOCK(X) ((void)0)
+#define ATOMIC_UNLOCK(X) ((void)0)
+#endif
+
 struct bo {
        struct driver *drv;
        uint32_t width;
@@ -62,7 +75,7 @@ struct driver {
        void *buffer_table;
        void *map_table;
        struct combinations combos;
-       pthread_mutex_t driver_lock;
+       atomic_flag driver_lock;
 };
 
 struct backend {
@@ -77,18 +90,19 @@ struct backend {
        int (*bo_import)(struct bo *bo, struct drv_import_fd_data *data);
        void *(*bo_map)(struct bo *bo, struct map_info *data, size_t plane, uint32_t map_flags);
        int (*bo_unmap)(struct bo *bo, struct map_info *data);
+       int (*bo_invalidate)(struct bo *bo, struct map_info *data);
        int (*bo_flush)(struct bo *bo, struct map_info *data);
        uint32_t (*resolve_format)(uint32_t format, uint64_t use_flags);
 };
 
 // clang-format off
-#define BO_USE_RENDER_MASK BO_USE_LINEAR | BO_USE_RENDERING | BO_USE_RENDERSCRIPT | \
-                          BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN | BO_USE_SW_READ_RARELY | \
-                          BO_USE_SW_WRITE_RARELY | BO_USE_TEXTURE
+#define BO_USE_RENDER_MASK BO_USE_LINEAR | BO_USE_PROTECTED | BO_USE_RENDERING | \
+                          BO_USE_RENDERSCRIPT | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN | \
+                           BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY | BO_USE_TEXTURE
 
-#define BO_USE_TEXTURE_MASK BO_USE_LINEAR | BO_USE_RENDERSCRIPT | BO_USE_SW_READ_OFTEN | \
-                           BO_USE_SW_WRITE_OFTEN | BO_USE_SW_READ_RARELY | \
-                           BO_USE_SW_WRITE_RARELY | BO_USE_TEXTURE
+#define BO_USE_TEXTURE_MASK BO_USE_LINEAR | BO_USE_PROTECTED | BO_USE_RENDERSCRIPT | \
+                           BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN | \
+                            BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY | BO_USE_TEXTURE
 
 #define LINEAR_METADATA (struct format_metadata) { 0, 1, DRM_FORMAT_MOD_NONE }
 // clang-format on