From: Kristian Høgsberg Kristensen <krh@owl.jf.intel.com>
Date: Mon, 4 Jan 2016 18:53:47 +0000 (-0800)
Subject: isl: Use isl_align_npot for row_pitch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0f34a4ec4ee296121c0f2ae416d5899c846efd90;p=mesa.git

isl: Use isl_align_npot for row_pitch

Many formats are not power-of-two bytes per pixels and we need the
non-power-of-two align macro here.

This reverts the revert from 4f9a211b, but keeps the change from a827b553
that fixed the yuv if-else mix-up.
---

diff --git a/src/isl/isl.c b/src/isl/isl.c
index 3823a720660..6c49164615b 100644
--- a/src/isl/isl.c
+++ b/src/isl/isl.c
@@ -833,9 +833,9 @@ isl_calc_row_pitch(const struct isl_device *dev,
        */
       if (info->usage & ISL_SURF_USAGE_RENDER_TARGET_BIT) {
          if (isl_format_is_yuv(info->format)) {
-            row_pitch = isl_align(row_pitch, 2 * fmtl->bs);
+            row_pitch = isl_align_npot(row_pitch, 2 * fmtl->bs);
          } else  {
-            row_pitch = isl_align(row_pitch, fmtl->bs);
+            row_pitch = isl_align_npot(row_pitch, fmtl->bs);
          }
       }
       break;