From: Jordan Justen <jordan.l.justen@intel.com>
Date: Tue, 13 Aug 2019 08:37:11 +0000 (-0700)
Subject: iris: Add aux offset into hiz_address
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=aad36dfd1619a66c31f987322f2e66729e0813e8;p=mesa.git

iris: Add aux offset into hiz_address

This is not currently required because the hiz buffer is in a separate
buffer, and therefore the offset is 0. If we combine the aux buffer
with the main surface buffer, then the hiz offset may become non-zero.

Suggested-by: Nanley Chery <nanley.g.chery@intel.com>
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 2eecf46d24a..a3d93b769ce 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -2461,7 +2461,7 @@ iris_set_framebuffer_state(struct pipe_context *ctx,
          if (iris_resource_level_has_hiz(zres, view.base_level)) {
             info.hiz_usage = ISL_AUX_USAGE_HIZ;
             info.hiz_surf = &zres->aux.surf;
-            info.hiz_address = zres->aux.bo->gtt_offset;
+            info.hiz_address = zres->aux.bo->gtt_offset + zres->aux.offset;
          }
       }