From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Wed, 24 Aug 2016 04:46:58 +0000 (-0700)
Subject: intel/isl/gen9: Only use the magic 1D alignment for GEN9_1D surfaces
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8bdf605214874804369a879ca7d2f2de01e2af09;p=mesa.git

intel/isl/gen9: Only use the magic 1D alignment for GEN9_1D surfaces

If the surface has a layout of GEN4_2D then we need to compute a normal 2D
alignment and not use the magic linewar 1D alignment.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Reviewed-by: Chad Versace <chadversary@chromium.org>
---

diff --git a/src/intel/isl/isl_gen9.c b/src/intel/isl/isl_gen9.c
index cbbbba66272..da8c7491290 100644
--- a/src/intel/isl/isl_gen9.c
+++ b/src/intel/isl/isl_gen9.c
@@ -174,7 +174,7 @@ gen9_choose_image_alignment_el(const struct isl_device *dev,
       return;
    }
 
-   if (info->dim == ISL_SURF_DIM_1D) {
+   if (dim_layout == ISL_DIM_LAYOUT_GEN9_1D) {
       /* See the Skylake BSpec > Memory Views > Common Surface Formats > Surface
        * Layout and Tiling > 1D Surfaces > 1D Alignment Requirements.
        */