summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Charles <daniel.charles@intel.com>2017-09-26 09:40:42 -0700
committerchrome-bot <chrome-bot@chromium.org>2017-10-06 11:33:47 -0700
commit3122213d9a5570e5b7dfbfab496d7c8da0721efb (patch)
tree822a78654f6e48a9b14cbd03f7516177f98f9c62
parent14033e0013b5cc0ffc5af59dda7c377d46ec761d (diff)
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 <daniel.charles@intel.com> Reviewed-on: https://chromium-review.googlesource.com/685296 Tested-by: Ricky Liang <jcliang@chromium.org> Reviewed-by: Ricky Liang <jcliang@chromium.org>
-rw-r--r--i915.c6
1 files changed, 0 insertions, 6 deletions
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);