Fix potential uninitialized read am: 6acf248c84 am: 1c4a1cf7e4

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

diff --git a/drv.h b/drv.h
index 7abaf79..d27e845 100644 (file)
--- a/drv.h
+++ b/drv.h
@@ -37,6 +37,8 @@ extern "C" {
 #define BO_USE_CAMERA_READ             (1ull << 14)
 #define BO_USE_RENDERSCRIPT            (1ull << 16)
 #define BO_USE_TEXTURE                 (1ull << 17)
+#define BO_USE_HW_VIDEO_DECODER                (1ull << 18)
+
 
 /* Map flags */
 #define BO_MAP_NONE 0
@@ -78,15 +80,29 @@ struct drv_import_fd_data {
        uint64_t use_flags;
 };
 
-struct map_info {
+struct vma {
        void *addr;
        size_t length;
        uint32_t handle;
        uint32_t map_flags;
        int32_t refcount;
+       uint32_t map_strides[DRV_MAX_PLANES];
        void *priv;
 };
 
+struct rectangle {
+       uint32_t x;
+       uint32_t y;
+       uint32_t width;
+       uint32_t height;
+};
+
+struct mapping {
+       struct vma *vma;
+       struct rectangle rect;
+       uint32_t refcount;
+};
+
 struct driver *drv_create(int fd);
 
 void drv_destroy(struct driver *drv);
@@ -110,14 +126,14 @@ void drv_bo_destroy(struct bo *bo);
 
 struct bo *drv_bo_import(struct driver *drv, struct drv_import_fd_data *data);
 
-void *drv_bo_map(struct bo *bo, uint32_t x, uint32_t y, uint32_t width, uint32_t height,
-                uint32_t map_flags, struct map_info **map_data, size_t plane);
+void *drv_bo_map(struct bo *bo, const struct rectangle *rect, uint32_t map_flags,
+                struct mapping **map_data, size_t plane);
 
-int drv_bo_unmap(struct bo *bo, struct map_info *data);
+int drv_bo_unmap(struct bo *bo, struct mapping *mapping);
 
-int drv_bo_invalidate(struct bo *bo, struct map_info *data);
+int drv_bo_invalidate(struct bo *bo, struct mapping *mapping);
 
-int drv_bo_flush(struct bo *bo, struct map_info *data);
+int drv_bo_flush_or_unmap(struct bo *bo, struct mapping *mapping);
 
 uint32_t drv_bo_get_width(struct bo *bo);
 
@@ -141,7 +157,9 @@ uint64_t drv_bo_get_plane_format_modifier(struct bo *bo, size_t plane);
 
 uint32_t drv_bo_get_format(struct bo *bo);
 
-uint32_t drv_bo_get_stride_in_pixels(struct bo *bo);
+uint32_t drv_bytes_per_pixel_from_format(uint32_t format, size_t plane);
+
+uint32_t drv_stride_from_format(uint32_t format, uint32_t width, size_t plane);
 
 uint32_t drv_resolve_format(struct driver *drv, uint32_t format, uint64_t use_flags);
 
@@ -149,6 +167,14 @@ size_t drv_num_planes_from_format(uint32_t format);
 
 uint32_t drv_num_buffers_per_bo(struct bo *bo);
 
+#define drv_log(format, ...)                                                                       \
+       do {                                                                                       \
+               drv_log_prefix("minigbm", __FILE__, __LINE__, format, ##__VA_ARGS__);              \
+       } while (0)
+
+__attribute__((format(printf, 4, 5))) void drv_log_prefix(const char *prefix, const char *file,
+                                                         int line, const char *format, ...);
+
 #ifdef __cplusplus
 }
 #endif