struct format_metadata metadata;
drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
- &LINEAR_METADATA, BO_USE_RENDER_MASK);
+ &LINEAR_METADATA, BO_USE_RENDER_MASK | BO_USE_SCANOUT);
drv_add_combinations(drv, texture_source_formats, ARRAY_SIZE(texture_source_formats),
&LINEAR_METADATA, BO_USE_TEXTURE_MASK);
BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE);
drv_modify_combination(drv, DRM_FORMAT_R8, &metadata,
BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE);
+ /* Private formats for private reprocessing in camera */
+ drv_add_combination(drv, DRM_FORMAT_MTISP_SXYZW10, &metadata,
+ BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE | BO_USE_SW_MASK);
#endif
return drv_modify_linear_combinations(drv);
*/
stride = drv_stride_from_format(format, width, 0);
stride = ALIGN(stride, 64);
- drv_bo_from_format(bo, stride, height, format);
+
+ if (bo->meta.use_flags & BO_USE_HW_VIDEO_ENCODER) {
+ uint32_t aligned_height = ALIGN(height, 32);
+ uint32_t padding[DRV_MAX_PLANES] = { 0 };
+
+ for (plane = 0; plane < bo->meta.num_planes; ++plane) {
+ uint32_t plane_stride = drv_stride_from_format(format, stride, plane);
+ padding[plane] = plane_stride *
+ (32 / drv_vertical_subsampling_from_format(format, plane));
+ }
+
+ drv_bo_from_format_and_padding(bo, stride, aligned_height, format, padding);
+ } else {
+#ifdef MTK_MT8183
+ /*
+ * JPEG Encoder Accelerator requires 16x16 alignment. We want the buffer
+ * from camera can be put in JEA directly so align the height to 16
+ * bytes.
+ */
+ if (format == DRM_FORMAT_NV12)
+ height = ALIGN(height, 16);
+#endif
+ drv_bo_from_format(bo, stride, height, format);
+ }
memset(&gem_create, 0, sizeof(gem_create));
gem_create.size = bo->meta.total_size;
return MAP_FAILED;
}
- ret = drmPrimeHandleToFD(bo->drv->fd, gem_map.handle, DRM_CLOEXEC, &prime_fd);
- if (ret) {
+ prime_fd = drv_bo_get_plane_fd(bo, 0);
+ if (prime_fd < 0) {
drv_log("Failed to get a prime fd\n");
return MAP_FAILED;
}
switch (format) {
case DRM_FORMAT_FLEX_IMPLEMENTATION_DEFINED:
#ifdef MTK_MT8183
- /* Only for MT8183 Camera subsystem requires NV12. */
- if (use_flags & (BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE))
+ /* Only MT8183 Camera subsystem offers private reprocessing
+ * capability. CAMERA_READ indicates the buffer is intended for
+ * reprocessing and hence given the private format for MTK. */
+ if (use_flags & BO_USE_CAMERA_READ)
+ return DRM_FORMAT_MTISP_SXYZW10;
+ /* For non-reprocessing uses, only MT8183 Camera subsystem
+ * requires NV12. */
+ else if (use_flags & BO_USE_CAMERA_WRITE)
return DRM_FORMAT_NV12;
#endif
/*HACK: See b/28671744 */
case DRM_FORMAT_FLEX_YCbCr_420_888:
#ifdef MTK_MT8183
/* MT8183 camera and decoder subsystems require NV12. */
- if (use_flags &
- (BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE | BO_USE_HW_VIDEO_DECODER))
+ if (use_flags & (BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE |
+ BO_USE_HW_VIDEO_DECODER | BO_USE_HW_VIDEO_ENCODER)) {
return DRM_FORMAT_NV12;
+ }
#endif
return DRM_FORMAT_YVU420;
default: