DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master

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

diff --git a/drv_priv.h b/drv_priv.h
index 3e72706..719cd35 100644 (file)
--- a/drv_priv.h
+++ b/drv_priv.h
@@ -14,8 +14,7 @@
 
 #include "drv.h"
 
-struct bo
-{
+struct bo {
        struct driver *drv;
        uint32_t width;
        uint32_t height;
@@ -27,31 +26,15 @@ struct bo
        uint32_t sizes[DRV_MAX_PLANES];
        uint32_t strides[DRV_MAX_PLANES];
        uint64_t format_modifiers[DRV_MAX_PLANES];
+       uint64_t use_flags;
        size_t total_size;
        void *priv;
 };
 
-struct driver {
-       int fd;
-       struct backend *backend;
-       void *priv;
-       void *buffer_table;
-       void *map_table;
-       pthread_mutex_t driver_lock;
-};
-
-struct map_info {
-       void *addr;
-       size_t length;
-       uint32_t handle;
-       int32_t refcount;
-       void *priv;
-};
-
 struct kms_item {
        uint32_t format;
        uint64_t modifier;
-       uint64_t usage;
+       uint64_t use_flags;
 };
 
 struct format_metadata {
@@ -63,33 +46,57 @@ struct format_metadata {
 struct combination {
        uint32_t format;
        struct format_metadata metadata;
-       uint64_t usage;
+       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;
+       struct drv_array *mappings;
+       struct drv_array *combos;
+       pthread_mutex_t driver_lock;
 };
 
-struct backend
-{
+struct backend {
        char *name;
        int (*init)(struct driver *drv);
        void (*close)(struct driver *drv);
-       int (*bo_create)(struct bo *bo, uint32_t width, uint32_t height,
-                        uint32_t format, uint32_t flags);
-       int (*bo_create_with_modifiers)(struct bo *bo,
-                                       uint32_t width, uint32_t height,
-                                       uint32_t format,
-                                       const uint64_t *modifiers,
-                                       uint32_t count);
+       int (*bo_create)(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
+                        uint64_t use_flags);
+       int (*bo_create_with_modifiers)(struct bo *bo, uint32_t width, uint32_t height,
+                                       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 map_info *data, size_t plane);
-       int (*bo_unmap)(struct bo *bo, struct map_info *data);
-       uint32_t (*resolve_format)(uint32_t format);
-       struct combinations combos;
+       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);
 };
 
+// clang-format off
+#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_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 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