X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=drv_priv.h;h=719cd356818a26a606a829d1afca078af4b6e903;hb=16492826212086705cb14f9fa9c02a80e516f61f;hp=837310a70b794e143228fc63896d1653fca36ee4;hpb=27dd470c6464e9433dadb9e92378aa6c22929eb7;p=android-x86%2Fexternal-minigbm.git

diff --git a/drv_priv.h b/drv_priv.h
index 837310a..719cd35 100644
--- 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.
  */
@@ -13,10 +13,8 @@
 #include <sys/types.h>
 
 #include "drv.h"
-#include "list.h"
 
-struct bo
-{
+struct bo {
 	struct driver *drv;
 	uint32_t width;
 	uint32_t height;
@@ -28,48 +26,77 @@ 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 kms_item {
+	uint32_t format;
+	uint64_t modifier;
+	uint64_t use_flags;
 };
 
-struct map_info {
-	void *addr;
-	size_t length;
-	uint32_t handle;
-	int32_t refcount;
+struct format_metadata {
+	uint32_t priority;
+	uint32_t tiling;
+	uint64_t modifier;
 };
 
-struct supported_combination {
+struct combination {
 	uint32_t format;
-	uint64_t modifier;
-	uint64_t usage;
+	struct format_metadata metadata;
+	uint64_t use_flags;
 };
 
-struct combination_list_element {
-	struct supported_combination combination;
-	struct list_head link;
+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);
-	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,
+			 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);
-	uint32_t (*resolve_format)(uint32_t format);
-	struct list_head combinations;
+	int (*bo_import)(struct bo *bo, struct drv_import_fd_data *data);
+	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