From eea2d4d05987b4f8ad90a1588267f9495f1e9e99 Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Tue, 5 Jan 2016 14:28:28 -0800 Subject: [PATCH] isl: Don't align phys_slice0_sa.width twice It's already aligned to the format's block width. Don't align it again in isl_calc_row_pitch(). --- src/isl/isl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/isl/isl.c b/src/isl/isl.c index 4a1c9f4a94a..72fc4b8d9e1 100644 --- a/src/isl/isl.c +++ b/src/isl/isl.c @@ -821,8 +821,8 @@ isl_calc_row_pitch(const struct isl_device *dev, * texels, and must be converted to bytes based on the surface format * being used to determine whether additional pages need to be defined. */ - row_pitch = MAX(row_pitch, - fmtl->bs * isl_align_div_npot(phys_slice0_sa->w, fmtl->bw)); + assert(phys_slice0_sa->w % fmtl->bw == 0); + row_pitch = MAX(row_pitch, fmtl->bs * phys_slice0_sa->w); switch (tile_info->tiling) { case ISL_TILING_LINEAR: -- 2.30.2