Update Android.bp after merge

[android-x86/external-minigbm.git] / drv_priv.h

diff --git a/drv_priv.h b/drv_priv.h
index 719cd35..d918b33 100644 (file)
--- a/drv_priv.h
+++ b/drv_priv.h
@@ -8,33 +8,33 @@
 #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;
-       void *priv;
 };
 
-struct kms_item {
-       uint32_t format;
-       uint64_t modifier;
-       uint64_t use_flags;
+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 {
@@ -67,30 +67,37 @@ struct backend {
                         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);
        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);
+       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_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_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_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_MASK (BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN | \
+                       BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY)
 
-#define BO_USE_SW_RARELY 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