lineage-rockchip/android_external_minigbm
1
0
Fork 0
Code Activity Actions

rockchip: Fix the size computation with NV12 buffer

Browse source 
The size and offsets are computed with the given height that is not aligned.
This CL changes to compute them with an aligned height

Bug: None
Test: video_decode_accelerator_tests on kevin
Change-Id: I3e316400d2ab40beee8785f337e9451408ef7318
Reviewed-on: https://chromium-review.googlesource.com/1729176
Tested-by: Hirokazu Honda <hiroh@chromium.org>
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
This commit is contained in:
Hirokazu Honda 2019-08-01 16:37:47 +09:00 • committed by chrome-bot
parent 5dc63faf56
commit b892a8f722
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rockchip.c
View file

@ -159,14 +159,18 @@ static int rockchip_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint
struct drm_rockchip_gem_create gem_create;
if (format == DRM_FORMAT_NV12) {
uint32_t w_mbs = DIV_ROUND_UP(ALIGN(width, 16), 16);
uint32_t h_mbs = DIV_ROUND_UP(ALIGN(height, 16), 16);
uint32_t w_mbs = DIV_ROUND_UP(width, 16);
uint32_t h_mbs = DIV_ROUND_UP(height, 16);
uint32_t aligned_width = w_mbs * 16;
uint32_t aligned_height = DIV_ROUND_UP(h_mbs * 16 * 3, 2);
uint32_t aligned_height = h_mbs * 16;
drv_bo_from_format(bo, aligned_width, height, format);
bo->total_size = bo->strides[0] * aligned_height + w_mbs * h_mbs * 128;
drv_bo_from_format(bo, aligned_width, aligned_height, format);
/*
* drv_bo_from_format updates total_size. Add an extra data space for rockchip video
* driver to store motion vectors.
*/
bo->total_size += w_mbs * h_mbs * 128;
} else if (width <= 2560 &&
drv_has_modifier(modifiers, count, DRM_FORMAT_MOD_CHROMEOS_ROCKCHIP_AFBC)) {
/* If the caller has decided they can use AFBC, always