From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Thu, 9 Jun 2016 22:08:13 +0000 (-0700)
Subject: isl/state: Don't set SurfacePitch for gen9 1-D textures
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ce24097abe1427463ac300a686e4c36ea07464fc;p=mesa.git

isl/state: Don't set SurfacePitch for gen9 1-D textures

This field is ignored by the hardware in this case and, on very large 1-D
textures, it can end up being larger than the maximum allowed value.

Reviewed-by: Chad Versace <chad.versace@intel.com>
Cc: "12.0" <mesa-stable@lists.freedesktop.org>
---

diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c
index 9569c3ef44f..15b2fa9cadc 100644
--- a/src/intel/isl/isl_surface_state.c
+++ b/src/intel/isl/isl_surface_state.c
@@ -313,6 +313,9 @@ isl_genX(surf_fill_state_s)(const struct isl_device *dev, void *state,
        *    two rows interleaved."
        */
       s.SurfacePitch = info->surf->row_pitch * 2 - 1;
+   } else if (info->surf->dim_layout == ISL_DIM_LAYOUT_GEN9_1D) {
+      /* For gen9 1-D textures, surface pitch is ignored */
+      s.SurfacePitch = 0;
    } else {
       s.SurfacePitch = info->surf->row_pitch - 1;
    }