X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=drv_priv.h;h=719cd356818a26a606a829d1afca078af4b6e903;hb=cef328d2bc5d72f075fd3753428657fc4ec0048e;hp=9684e9d0bd04bdf05545bd5acbdb9cd81261dff9;hpb=60ee5833b16182702cafce54278721b635f3be89;p=android-x86%2Fexternal-minigbm.git

diff --git a/drv_priv.h b/drv_priv.h
index 9684e9d..719cd35 100644
--- a/drv_priv.h
+++ b/drv_priv.h
@@ -26,7 +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;
+	uint64_t use_flags;
 	size_t total_size;
 	void *priv;
 };
@@ -34,7 +34,7 @@ struct bo {
 struct kms_item {
 	uint32_t format;
 	uint64_t modifier;
-	uint64_t usage;
+	uint64_t use_flags;
 };
 
 struct format_metadata {
@@ -46,22 +46,16 @@ struct format_metadata {
 struct combination {
 	uint32_t format;
 	struct format_metadata metadata;
-	uint64_t usage;
-};
-
-struct combinations {
-	struct combination *data;
-	uint32_t size;
-	uint32_t allocations;
+	uint64_t use_flags;
 };
 
 struct driver {
 	int fd;
-	struct backend *backend;
+	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;
 };
 
@@ -70,27 +64,39 @@ struct backend {
 	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,
-			 uint64_t flags);
+			 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 prot);
-	int (*bo_unmap)(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 usage);
+	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_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_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_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_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) { 0, 1, DRM_FORMAT_MOD_NONE }
+#define LINEAR_METADATA (struct format_metadata) { 1, 0, DRM_FORMAT_MOD_LINEAR }
 // clang-format on
 
 #endif