From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Sat, 4 Jun 2016 21:32:37 +0000 (-0700)
Subject: i965/gen8: Use the qpitch from the aux_mt for AUX_QPITCH
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1436238b75e0352439306f120ac1ca03c9fc7df3;p=mesa.git

i965/gen8: Use the qpitch from the aux_mt for AUX_QPITCH

Reviewed-by: Chad Versace <chad.versace@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Cc: "11.1 11.2 12.0" <mesa-stable@lists.freedesktop.org>
---

diff --git a/src/mesa/drivers/dri/i965/gen8_surface_state.c b/src/mesa/drivers/dri/i965/gen8_surface_state.c
index ee4781b7d25..6a98d76a08f 100644
--- a/src/mesa/drivers/dri/i965/gen8_surface_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_surface_state.c
@@ -325,7 +325,7 @@ gen8_emit_texture_surface_state(struct brw_context *brw,
       assert(aux_mt->tiling == I915_TILING_Y);
       intel_get_tile_dims(aux_mt->tiling, aux_mt->tr_mode,
                           aux_mt->cpp, &tile_w, &tile_h);
-      surf[6] = SET_FIELD(mt->qpitch / 4, GEN8_SURFACE_AUX_QPITCH) |
+      surf[6] = SET_FIELD(aux_mt->qpitch / 4, GEN8_SURFACE_AUX_QPITCH) |
                 SET_FIELD((aux_mt->pitch / tile_w) - 1,
                           GEN8_SURFACE_AUX_PITCH) |
                 aux_mode;
@@ -546,7 +546,7 @@ gen8_update_renderbuffer_surface(struct brw_context *brw,
       assert(aux_mt->tiling == I915_TILING_Y);
       intel_get_tile_dims(aux_mt->tiling, aux_mt->tr_mode,
                           aux_mt->cpp, &tile_w, &tile_h);
-      surf[6] = SET_FIELD(mt->qpitch / 4, GEN8_SURFACE_AUX_QPITCH) |
+      surf[6] = SET_FIELD(aux_mt->qpitch / 4, GEN8_SURFACE_AUX_QPITCH) |
                 SET_FIELD((aux_mt->pitch / tile_w) - 1,
                           GEN8_SURFACE_AUX_PITCH) |
                 aux_mode;