X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=drv_priv.h;h=6aa3f834e9ef2690d5c6cc676b8f628d11daa225;hb=03bb0b1eb41d943ad042888a33f86588df57ed21;hp=09a8364070a87b10f4fce882d5b77954fa0bb652;hpb=2e786ad60038a7c772006e3190fcb8bcf1ff267d;p=android-x86%2Fexternal-minigbm.git

diff --git a/drv_priv.h b/drv_priv.h
index 09a8364..6aa3f83 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.
  */
@@ -7,15 +7,27 @@
 #ifndef DRV_PRIV_H
 #define DRV_PRIV_H
 
-#include <pthread.h>
+
 #include <stdint.h>
 #include <stdlib.h>
 #include <sys/types.h>
+#include <stdatomic.h>
 
 #include "drv.h"
 
-struct bo
-{
+#ifndef DISABLE_LOCK
+#define ATOMIC_LOCK(X) \
+while (atomic_flag_test_and_set(X)) { \
+  }
+
+#define ATOMIC_UNLOCK(X) \
+  atomic_flag_clear(X);
+#else
+#define ATOMIC_LOCK(X) ((void)0)
+#define ATOMIC_UNLOCK(X) ((void)0)
+#endif
+
+struct bo {
 	struct driver *drv;
 	uint32_t width;
 	uint32_t height;
@@ -27,41 +39,72 @@ 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 kms_item {
+	uint32_t format;
+	uint64_t modifier;
+	uint64_t use_flags;
+};
+
+struct format_metadata {
+	uint32_t priority;
+	uint32_t tiling;
+	uint64_t modifier;
+};
+
+struct combination {
+	uint32_t format;
+	struct format_metadata metadata;
+	uint64_t use_flags;
+};
+
+struct combinations {
+	struct combination *data;
+	uint32_t size;
+	uint32_t allocations;
+};
+
 struct driver {
 	int fd;
 	struct backend *backend;
 	void *priv;
 	void *buffer_table;
 	void *map_table;
-	pthread_mutex_t table_lock;
+	struct combinations combos;
+	atomic_flag driver_lock;
 };
 
-struct map_info {
-	void *addr;
-	size_t length;
-	uint32_t handle;
-	int32_t refcount;
-};
-
-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,
+			 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);
-	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, uint32_t map_flags);
+	int (*bo_unmap)(struct bo *bo, struct map_info *data);
+	int (*bo_invalidate)(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 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 LINEAR_METADATA (struct format_metadata) { 0, 1, DRM_FORMAT_MOD_NONE }
+// clang-format on
+
 #endif