X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=drv_priv.h;h=3f7a2fd8b31eba0b7f2cd332403c59731fdbb591;hb=662a9fd2acd72fd73e72110924ea9f350429195d;hp=09007de833f9bcf3c1389eccd7862fd005a106c3;hpb=3e9d3830dce97cb0146b9f6e0f4942253f39ca69;p=android-x86%2Fexternal-minigbm.git diff --git a/drv_priv.h b/drv_priv.h index 09007de..3f7a2fd 100644 --- a/drv_priv.h +++ b/drv_priv.h @@ -8,33 +8,33 @@ #define DRV_PRIV_H #include +#include #include #include #include #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 { @@ -49,20 +49,15 @@ struct combination { uint64_t use_flags; }; -struct combinations { - struct combination *data; - uint32_t size; - uint32_t allocations; -}; - struct driver { int fd; const struct backend *backend; void *priv; void *buffer_table; - void *map_table; - struct combinations combos; + struct drv_array *mappings; + struct drv_array *combos; pthread_mutex_t driver_lock; + bool compression; }; struct backend { @@ -73,25 +68,44 @@ 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_get_plane_fd)(struct bo *bo, size_t plane); 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 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); + 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_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_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_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_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) { 0, 1, DRM_FORMAT_MOD_NONE } +#define LINEAR_METADATA (struct format_metadata) { 1, 0, DRM_FORMAT_MOD_LINEAR } // clang-format on #endif