From: Daniel Charles Date: Tue, 26 Sep 2017 16:40:42 +0000 (-0700) Subject: Revert "minigbm: align multi-planar formats to 16" X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fexternal-minigbm.git;a=commitdiff_plain;h=3122213d9a5570e5b7dfbfab496d7c8da0721efb Revert "minigbm: align multi-planar formats to 16" This reverts commit 6a8828492f4252a7c125a984823599bd65e3cb03. Revert reason: intel-vaapi-driver can relax height alignment alignment is only enforced on tiled surfaced, after confirming minigbm will provide linear surfaces, surfaces height needs to be 4 bit aligned. BUG=b/65272348 TEST="intel-vaapi-driver regular testing, VAVDA, VAVEA, VAJDA" TEST="minigbm media tests within container" TEST="tests mentioned in the bug" CQ-DEPEND=CL:671650 Change-Id: Ifdccca9d7f85be0cbb504c0c0a2b4712aed99826 Signed-off-by: Daniel Charles Reviewed-on: https://chromium-review.googlesource.com/685296 Tested-by: Ricky Liang Reviewed-by: Ricky Liang --- diff --git a/i915.c b/i915.c index 2d75793..70ecc5a 100644 --- a/i915.c +++ b/i915.c @@ -224,12 +224,6 @@ static int i915_align_dimensions(struct bo *bo, uint32_t tiling, uint32_t *strid break; } - /* - * For multi-planar formats we must be aligned to 16 - */ - if (bo->num_planes > 1) - vertical_alignment = MAX(vertical_alignment, 16); - *aligned_height = ALIGN(bo->height, vertical_alignment); if (i915->gen > 3) { *stride = ALIGN(*stride, horizontal_alignment);