diff options
| author | Hirokazu Honda <hiroh@chromium.org> | 2019-10-11 15:54:50 +0900 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-12-25 08:26:11 +0000 |
| commit | 2a2bfc25bb4eaf53d6d1d9e1990c6b2888d4d3fb (patch) | |
| tree | 06cbb27386a35fd006b3ab8f41a5f4771f70a59c /mediatek.c | |
| parent | 6e6dc49707737d0578617f89cb01bb585f9b00c3 (diff) | |
| download | platform_external_minigbm-2a2bfc25bb4eaf53d6d1d9e1990c6b2888d4d3fb.tar.gz platform_external_minigbm-2a2bfc25bb4eaf53d6d1d9e1990c6b2888d4d3fb.tar.bz2 platform_external_minigbm-2a2bfc25bb4eaf53d6d1d9e1990c6b2888d4d3fb.zip | |
mediatek: Allocate a buffer expected by encoder if BO_USE_HW_VIDEO_ENCODER
MediaTek driver expects 16 aligned width and 32 aligned height for an input
buffer on encoding [1]. Besides, there is an extra data between planes.
This changes the minigbm allocation to match the expectation though width
is aligned by 64 for the AMD cache-width optimization.
[1] https://chromium.googlesource.com/chromiumos/third_party/kernel/+/3c551224d8600b956ed53097520501d58f31cf59/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c#278
BUG=b:144135251
TEST=ARC++ encoder on kukui
Change-Id: Id330a8a6b0a40040098920427e6e29f05fcb64d4
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/1855520
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Tested-by: Hirokazu Honda <hiroh@chromium.org>
Auto-Submit: Hirokazu Honda <hiroh@chromium.org>
Commit-Queue: Hsu Wei-Cheng <mojahsu@chromium.org>
Diffstat (limited to 'mediatek.c')
| -rw-r--r-- | mediatek.c | 21 |
1 files changed, 18 insertions, 3 deletions
@@ -115,7 +115,21 @@ static int mediatek_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint */ 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 { + drv_bo_from_format(bo, stride, height, format); + } memset(&gem_create, 0, sizeof(gem_create)); gem_create.size = bo->meta.total_size; @@ -252,9 +266,10 @@ static uint32_t mediatek_resolve_format(struct driver *drv, uint32_t format, uin 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: |