[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 03d46b8ec2 ...

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

diff --git a/drv_priv.h b/drv_priv.h
index e5b9d55..719cd35 100644 (file)
--- a/drv_priv.h
+++ b/drv_priv.h
@@ -49,19 +49,13 @@ struct combination {
        uint64_t use_flags;
 };
 
-struct combinations {
-       struct combination *data;
-       uint32_t size;
-       uint32_t allocations;
-};
-
 struct driver {
        int fd;
        const struct backend *backend;
        void *priv;
        void *buffer_table;
-       void *map_table;
-       struct combinations combos;
+       struct drv_array *mappings;
+       struct drv_array *combos;
        pthread_mutex_t driver_lock;
 };
 
@@ -75,8 +69,8 @@ struct backend {
                                        uint32_t format, const uint64_t *modifiers, uint32_t count);
        int (*bo_destroy)(struct bo *bo);
        int (*bo_import)(struct bo *bo, struct drv_import_fd_data *data);
-       void *(*bo_map)(struct bo *bo, struct mapping *mapping, size_t plane, uint32_t map_flags);
-       int (*bo_unmap)(struct bo *bo, struct mapping *mapping);
+       void *(*bo_map)(struct bo *bo, struct vma *vma, size_t plane, uint32_t map_flags);
+       int (*bo_unmap)(struct bo *bo, struct vma *vma);
        int (*bo_invalidate)(struct bo *bo, struct mapping *mapping);
        int (*bo_flush)(struct bo *bo, struct mapping *mapping);
        uint32_t (*resolve_format)(uint32_t format, uint64_t use_flags);
@@ -91,7 +85,18 @@ struct backend {
                            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 }
+#define BO_USE_SW BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN | \
+           BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY
+
+#define BO_USE_SW_OFTEN BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN
+
+#define BO_USE_SW_RARELY BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY
+
+#ifndef DRM_FORMAT_MOD_LINEAR
+#define DRM_FORMAT_MOD_LINEAR DRM_FORMAT_MOD_NONE
+#endif
+
+#define LINEAR_METADATA (struct format_metadata) { 1, 0, DRM_FORMAT_MOD_LINEAR }
 // clang-format on
 
 #endif