X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=drv.h;h=4a47b7628cd763c7c4ca04d3dabd951771dc0876;hb=bbba9dde65832cf03f1a0e9739e81e8ad689a508;hp=0cb062d97ac2f13d5671da50ce218dfc3a68fa57;hpb=48b4c086ab660c4b6e94cffe5b93248c59a641b8;p=android-x86%2Fexternal-minigbm.git

diff --git a/drv.h b/drv.h
index 0cb062d..4a47b76 100644
--- a/drv.h
+++ b/drv.h
@@ -12,6 +12,7 @@ extern "C" {
 #endif
 
 #include <drm_fourcc.h>
+#include <stdbool.h>
 #include <stdint.h>
 
 #define DRV_MAX_PLANES 4
@@ -33,10 +34,14 @@ extern "C" {
 #define BO_USE_SW_READ_RARELY	        (1ull << 10)
 #define BO_USE_SW_WRITE_OFTEN	        (1ull << 11)
 #define BO_USE_SW_WRITE_RARELY		(1ull << 12)
-#define BO_USE_HW_VIDEO_ENCODER         (1ull << 13)
-#define BO_USE_HW_VIDEO_DECODER         (1ull << 14)
-#define BO_USE_RENDERSCRIPT		(1ull << 15)
+#define BO_USE_HW_VIDEO_DECODER         (1ull << 13)
+#define BO_USE_HW_VIDEO_ENCODER         (1ull << 14)
+#define BO_USE_TEST_ALLOC		(1ull << 15)
+#define BO_USE_RENDERSCRIPT		(1ull << 16)
 
+/* Quirks for allocating a buffer. */
+#define BO_QUIRK_NONE			0
+#define BO_QUIRK_DUMB32BPP		(1ull << 0)
 
 /* Map flags */
 #define BO_MAP_NONE 0
@@ -48,12 +53,16 @@ extern "C" {
  * on the namespace of already defined formats, which can be done by using invalid
  * fourcc codes.
  */
-
 #define DRM_FORMAT_NONE				fourcc_code('0', '0', '0', '0')
 #define DRM_FORMAT_YVU420_ANDROID		fourcc_code('9', '9', '9', '7')
 #define DRM_FORMAT_FLEX_IMPLEMENTATION_DEFINED	fourcc_code('9', '9', '9', '8')
 #define DRM_FORMAT_FLEX_YCbCr_420_888		fourcc_code('9', '9', '9', '9')
 
+/* This is a 10-bit bayer format for private reprocessing on MediaTek ISP. It's
+ * a private RAW format that other DRM drivers will never support and thus
+ * making it not upstreamable (i.e., defined in official DRM headers). */
+#define DRM_FORMAT_MTISP_SXYZW10		fourcc_code('M', 'B', '1', '0')
+
 // TODO(crbug.com/958181): remove this definition once drm_fourcc.h contains it.
 #ifndef DRM_FORMAT_P010
 #define DRM_FORMAT_P010 fourcc_code('P', '0', '1', '0')
@@ -80,6 +89,7 @@ struct drv_import_fd_data {
 	uint32_t width;
 	uint32_t height;
 	uint32_t format;
+	uint32_t tiling;
 	uint64_t use_flags;
 };
 
@@ -117,7 +127,7 @@ const char *drv_get_name(struct driver *drv);
 struct combination *drv_get_combination(struct driver *drv, uint32_t format, uint64_t use_flags);
 
 struct bo *drv_bo_new(struct driver *drv, uint32_t width, uint32_t height, uint32_t format,
-		      uint64_t use_flags);
+		      uint64_t use_flags, bool is_test_buffer);
 
 struct bo *drv_bo_create(struct driver *drv, uint32_t width, uint32_t height, uint32_t format,
 			 uint64_t use_flags);
@@ -136,14 +146,14 @@ int drv_bo_unmap(struct bo *bo, struct mapping *mapping);
 
 int drv_bo_invalidate(struct bo *bo, struct mapping *mapping);
 
+int drv_bo_flush(struct bo *bo, struct mapping *mapping);
+
 int drv_bo_flush_or_unmap(struct bo *bo, struct mapping *mapping);
 
 uint32_t drv_bo_get_width(struct bo *bo);
 
 uint32_t drv_bo_get_height(struct bo *bo);
 
-uint32_t drv_bo_get_stride_or_tiling(struct bo *bo);
-
 size_t drv_bo_get_num_planes(struct bo *bo);
 
 union bo_handle drv_bo_get_plane_handle(struct bo *bo, size_t plane);
@@ -168,8 +178,13 @@ uint32_t drv_resolve_format(struct driver *drv, uint32_t format, uint64_t use_fl
 
 size_t drv_num_planes_from_format(uint32_t format);
 
+size_t drv_num_planes_from_modifier(struct driver *drv, uint32_t format, uint64_t modifier);
+
 uint32_t drv_num_buffers_per_bo(struct bo *bo);
 
+int drv_resource_info(struct bo *bo, uint32_t strides[DRV_MAX_PLANES],
+		      uint32_t offsets[DRV_MAX_PLANES]);
+
 #define drv_log(format, ...)                                                                       \
 	do {                                                                                       \
 		drv_log_prefix("minigbm", __FILE__, __LINE__, format, ##__VA_ARGS__);              \