From d09db2d7b2a1199f05bf43b1420b6af189b06cf8 Mon Sep 17 00:00:00 2001
From: Jordan Justen <jordan.l.justen@intel.com>
Date: Fri, 16 Feb 2018 02:20:00 -0800
Subject: [PATCH] isl/gen12: 64k surface alignment

Reworks:
 * Update size for aux map change (Nanley)

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---
 src/intel/isl/isl.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index d2bc8a11853..850e5b1ee95 100644
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -1538,6 +1538,10 @@ isl_surf_init_s(const struct isl_device *dev,
       base_alignment_B = MAX(info->min_alignment_B, tile_size_B);
    }
 
+   if (ISL_DEV_GEN(dev) >= 12) {
+      base_alignment_B = MAX(base_alignment_B, 64 * 1024);
+   }
+
    if (ISL_DEV_GEN(dev) < 9) {
       /* From the Broadwell PRM Vol 5, Surface Layout:
        *
-- 
2.30.2