From a7e827192bdbc82f2e0b3c9c5cd9c17004c3f77b Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Wed, 30 Dec 2015 14:02:20 -0800
Subject: [PATCH] isl: Tile-align height in image size calculation

This fixes a bunch of gpu hangs on the dEQP-VK.glsl.ShaderExecutor.common
group of CTS tests.
---
 src/isl/isl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/isl/isl.c b/src/isl/isl.c
index df0aeed01df..75f65001a1e 100644
--- a/src/isl/isl.c
+++ b/src/isl/isl.c
@@ -1016,7 +1016,7 @@ isl_surf_init_s(const struct isl_device *dev,
                                array_pitch_el_rows);
 
    const uint32_t total_h_sa = total_h_el * fmtl->bh;
-   const uint32_t size = row_pitch * total_h_sa;
+   const uint32_t size = row_pitch * isl_align(total_h_sa, tile_info.height);
 
    /* Alignment of surface base address, in bytes */
    uint32_t base_alignment = info->min_alignment;
-- 
2.30.2