X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=drv_priv.h;h=d918b33d27cc82cb0a1085c7110b69711249d433;hb=1d3637fbf629203c6647bacf585ebbbb3bf6e733;hp=349d02e1a51d950672ead0b852b5164ebef8f6cd;hpb=1647fbe1196e21cb314a4c9b950846393e1dbc6a;p=android-x86%2Fexternal-minigbm.git

diff --git a/drv_priv.h b/drv_priv.h
index 349d02e..d918b33 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,49 +7,103 @@
 #ifndef DRV_PRIV_H
 #define DRV_PRIV_H
 
+#include <pthread.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
 #include "drv.h"
 
-struct bo
-{
-	struct driver *drv;
+struct bo_metadata {
 	uint32_t width;
 	uint32_t height;
 	uint32_t format;
 	uint32_t tiling;
 	size_t num_planes;
-	union bo_handle handles[DRV_MAX_PLANES];
 	uint32_t offsets[DRV_MAX_PLANES];
 	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;
+};
+
+struct bo {
+	struct driver *drv;
+	struct bo_metadata meta;
+	bool is_test_buffer;
+	union bo_handle handles[DRV_MAX_PLANES];
 	void *priv;
 };
 
+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 driver {
 	int fd;
-	struct backend *backend;
+	const struct backend *backend;
 	void *priv;
 	void *buffer_table;
-	pthread_mutex_t table_lock;
+	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,
-			 drv_format_t format, uint32_t flags);
+	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);
+	// Either both or neither _metadata functions must be implemented.
+	// If the functions are implemented, bo_create and bo_create_with_modifiers must not be.
+	int (*bo_compute_metadata)(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
+				   uint64_t use_flags, const uint64_t *modifiers, uint32_t count);
+	int (*bo_create_from_metadata)(struct bo *bo);
 	int (*bo_destroy)(struct bo *bo);
-	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 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)(struct driver *drv, uint32_t format, uint64_t use_flags);
+	size_t (*num_planes_from_modifier)(struct driver *drv, uint32_t format, uint64_t modifier);
+	int (*resource_info)(struct bo *bo, uint32_t strides[DRV_MAX_PLANES],
+			     uint32_t offsets[DRV_MAX_PLANES]);
 };
 
+// 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 BO_USE_SW_MASK (BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN | \
+			BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY)
+
+#define BO_USE_NON_GPU_HW (BO_USE_SCANOUT | BO_USE_CAMERA_WRITE | BO_USE_CAMERA_READ | \
+			   BO_USE_HW_VIDEO_ENCODER | BO_USE_HW_VIDEO_DECODER)
+
+#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