minigbm: Make sure no mappings remain when closing a GEM handle

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

diff --git a/drv_priv.h b/drv_priv.h
index 09a8364..5547b78 100644 (file)
--- a/drv_priv.h
+++ b/drv_priv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 The Chromium OS Authors. All rights reserved.
+ * Copyright 2016 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -14,8 +14,7 @@
 
 #include "drv.h"
 
-struct bo
-{
+struct bo {
        struct driver *drv;
        uint32_t width;
        uint32_t height;
@@ -27,6 +26,7 @@ struct bo
        uint32_t sizes[DRV_MAX_PLANES];
        uint32_t strides[DRV_MAX_PLANES];
        uint64_t format_modifiers[DRV_MAX_PLANES];
+       uint64_t flags;
        size_t total_size;
        void *priv;
 };
@@ -37,31 +37,59 @@ struct driver {
        void *priv;
        void *buffer_table;
        void *map_table;
-       pthread_mutex_t table_lock;
+       pthread_mutex_t driver_lock;
 };
 
-struct map_info {
-       void *addr;
-       size_t length;
-       uint32_t handle;
-       int32_t refcount;
+struct kms_item {
+       uint32_t format;
+       uint64_t modifier;
+       uint64_t usage;
+};
+
+struct format_metadata {
+       uint32_t priority;
+       uint32_t tiling;
+       uint64_t modifier;
+};
+
+struct combination {
+       uint32_t format;
+       struct format_metadata metadata;
+       uint64_t usage;
+};
+
+struct combinations {
+       struct combination *data;
+       uint32_t size;
+       uint32_t allocations;
 };
 
-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,
-                        drv_format_t format, uint32_t flags);
-       void* (*bo_map)(struct bo *bo, struct map_info *data, size_t plane);
+       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_destroy)(struct bo *bo);
-       drv_format_t (*resolve_format)(drv_format_t format);
-       struct format_supported {
-               drv_format_t format;
-               uint64_t usage;
-       }
-       format_list[18];
+       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 prot);
+       int (*bo_unmap)(struct bo *bo, struct map_info *data);
+       uint32_t (*resolve_format)(uint32_t format, uint64_t usage);
+       struct combinations combos;
 };
 
+// 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_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 LINEAR_METADATA (struct format_metadata) { 0, 1, DRM_FORMAT_MOD_NONE }
+// clang-format on
+
 #endif