iris: add some draw resolve hooks

6 files changed, 236 insertions, 47 deletions

diff --git a/src/gallium/drivers/iris/iris_blit.c b/src/gallium/drivers/iris/iris_blit.c
index 347864f4556..0f96ec032cd 100644
--- a/src/gallium/drivers/iris/iris_blit.c
+++ b/src/gallium/drivers/iris/iris_blit.c
@@ -264,6 +264,7 @@ iris_blit(struct pipe_context *ctx, const struct pipe_blit_info *info)
    struct iris_context *ice = (void *) ctx;
    struct iris_screen *screen = (struct iris_screen *)ctx->screen;
    const struct gen_device_info *devinfo = &screen->devinfo;
+   struct iris_batch *batch = &ice->batches[IRIS_BATCH_RENDER];
    enum blorp_batch_flags blorp_flags = 0;
    struct iris_resource *src_res = (void *) info->src.resource;
    struct iris_resource *dst_res = (void *) info->dst.resource;
@@ -292,7 +293,7 @@ iris_blit(struct pipe_context *ctx, const struct pipe_blit_info *info)
    bool src_clear_supported = src_aux_usage != ISL_AUX_USAGE_NONE &&
                               src_res->surf.format == src_fmt.fmt;
 
-   iris_resource_prepare_access(ice, src_res, info->src.level, 1,
+   iris_resource_prepare_access(ice, batch, src_res, info->src.level, 1,
                                 info->src.box.z, info->src.box.depth,
                                 src_aux_usage, src_clear_supported);
 
@@ -309,7 +310,7 @@ iris_blit(struct pipe_context *ctx, const struct pipe_blit_info *info)
    iris_blorp_surf_for_resource(&dst_surf, info->dst.resource,
                                 ISL_AUX_USAGE_NONE, true);
 
-   iris_resource_prepare_access(ice, dst_res, info->dst.level, 1,
+   iris_resource_prepare_access(ice, batch, dst_res, info->dst.level, 1,
                                 info->dst.box.z, info->dst.box.depth,
                                 dst_aux_usage, dst_clear_supported);
 
@@ -380,8 +381,6 @@ iris_blit(struct pipe_context *ctx, const struct pipe_blit_info *info)
       filter = BLORP_FILTER_NEAREST;
    }
 
-   struct iris_batch *batch = &ice->batches[IRIS_BATCH_RENDER];
-
    struct blorp_batch blorp_batch;
    blorp_batch_init(&ice->blorp, &blorp_batch, batch, blorp_flags);
 
@@ -496,10 +495,10 @@ iris_resource_copy_region(struct pipe_context *ctx,
    get_copy_region_aux_settings(devinfo, dst_res, &dst_aux_usage,
                                 &dst_clear_supported);
 
-   iris_resource_prepare_access(ice, src_res, src_level, 1,
+   iris_resource_prepare_access(ice, batch, src_res, src_level, 1,
                                 src_box->z, src_box->depth,
                                 src_aux_usage, src_clear_supported);
-   iris_resource_prepare_access(ice, dst_res, dst_level, 1,
+   iris_resource_prepare_access(ice, batch, dst_res, dst_level, 1,
                                 dstz, src_box->depth,
                                 dst_aux_usage, dst_clear_supported);
 
diff --git a/src/gallium/drivers/iris/iris_clear.c b/src/gallium/drivers/iris/iris_clear.c
index 1fa85241723..11b0a55ba41 100644
--- a/src/gallium/drivers/iris/iris_clear.c
+++ b/src/gallium/drivers/iris/iris_clear.c
@@ -68,7 +68,7 @@ clear_color(struct iris_context *ice,
       iris_resource_render_aux_usage(ice, res, format,
                                      false, false);
 
-   iris_resource_prepare_render(ice, res, level,
+   iris_resource_prepare_render(ice, batch, res, level,
                                 box->z, box->depth, aux_usage);
 
    struct blorp_surf surf;
@@ -128,7 +128,7 @@ clear_depth_stencil(struct iris_context *ice,
    iris_get_depth_stencil_resources(p_res, &z_res, &stencil_res);
 
    if (z_res) {
-      iris_resource_prepare_depth(ice, z_res, level, box->z, box->depth);
+      iris_resource_prepare_depth(ice, batch, z_res, level, box->z, box->depth);
       iris_blorp_surf_for_resource(&z_surf, &z_res->base,
                                    z_res->aux.usage, true);
    }
diff --git a/src/gallium/drivers/iris/iris_context.h b/src/gallium/drivers/iris/iris_context.h
index 13dd091ded8..1f8e000bd67 100644
--- a/src/gallium/drivers/iris/iris_context.h
+++ b/src/gallium/drivers/iris/iris_context.h
@@ -503,6 +503,12 @@ struct iris_context {
       /** Reference to the SURFACE_STATE for the compute grid resource */
       struct iris_state_ref grid_surf_state;
 
+      /**
+       * Array of aux usages for drawing, altered to account for any
+       * self-dependencies from resources bound for sampling and rendering.
+       */
+      enum isl_aux_usage draw_aux_usage[BRW_MAX_DRAW_BUFFERS];
+
       /** Bitfield of whether color blending is enabled for RT[i] */
       uint8_t blend_enables;
 
@@ -697,10 +703,13 @@ uint64_t iris_timebase_scale(const struct gen_device_info *devinfo,
 
 /* iris_resolve.c */
 
-void iris_predraw_resolve_inputs(struct iris_batch *batch,
-                                 struct iris_shader_state *shs);
+void iris_predraw_resolve_inputs(struct iris_context *ice,
+                                 struct iris_batch *batch,
+                                 struct iris_shader_state *shs,
+                                 bool *draw_aux_buffer_disabled);
 void iris_predraw_resolve_framebuffer(struct iris_context *ice,
-                                      struct iris_batch *batch);
+                                      struct iris_batch *batch,
+                                      bool *draw_aux_buffer_disabled);
 void iris_postdraw_update_resolve_tracking(struct iris_context *ice,
                                            struct iris_batch *batch);
 void iris_cache_sets_clear(struct iris_batch *batch);
diff --git a/src/gallium/drivers/iris/iris_draw.c b/src/gallium/drivers/iris/iris_draw.c
index 19df5482f5e..5ccef66ea91 100644
--- a/src/gallium/drivers/iris/iris_draw.c
+++ b/src/gallium/drivers/iris/iris_draw.c
@@ -99,12 +99,13 @@ iris_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
 
    iris_update_compiled_shaders(ice);
 
+   bool draw_aux_buffer_disabled[BRW_MAX_DRAW_BUFFERS] = { };
    for (gl_shader_stage stage = 0; stage < MESA_SHADER_COMPUTE; stage++) {
       if (ice->shaders.prog[stage])
-         iris_predraw_resolve_inputs(batch, &ice->state.shaders[stage]);
+         iris_predraw_resolve_inputs(ice,batch, &ice->state.shaders[stage],
+                                     draw_aux_buffer_disabled);
    }
-
-   iris_predraw_resolve_framebuffer(ice, batch);
+   iris_predraw_resolve_framebuffer(ice, batch, draw_aux_buffer_disabled);
 
    iris_binder_reserve_3d(ice);
 
diff --git a/src/gallium/drivers/iris/iris_resolve.c b/src/gallium/drivers/iris/iris_resolve.c
index 9fc32fc0482..aedc12f125b 100644
--- a/src/gallium/drivers/iris/iris_resolve.c
+++ b/src/gallium/drivers/iris/iris_resolve.c
@@ -35,34 +35,101 @@
 #include "util/set.h"
 #include "iris_context.h"
 
+/**
+ * Disable auxiliary buffers if a renderbuffer is also bound as a texture
+ * or shader image.  This causes a self-dependency, where both rendering
+ * and sampling may concurrently read or write the CCS buffer, causing
+ * incorrect pixels.
+ */
+static bool
+disable_rb_aux_buffer(struct iris_context *ice,
+                      bool *draw_aux_buffer_disabled,
+                      struct iris_resource *tex_res,
+                      unsigned min_level, unsigned num_levels,
+                      const char *usage)
+{
+   struct pipe_framebuffer_state *cso_fb = &ice->state.framebuffer;
+   bool found = false;
+
+   /* We only need to worry about color compression and fast clears. */
+   if (tex_res->aux.usage != ISL_AUX_USAGE_CCS_D &&
+       tex_res->aux.usage != ISL_AUX_USAGE_CCS_E)
+      return false;
+
+   for (unsigned i = 0; i < cso_fb->nr_cbufs; i++) {
+      struct iris_surface *surf = (void *) cso_fb->cbufs[i];
+      if (!surf)
+         continue;
+
+      struct iris_resource *rb_res = (void *) surf->base.texture;
+
+      if (rb_res->bo == tex_res->bo &&
+          surf->base.u.tex.level >= min_level &&
+          surf->base.u.tex.level < min_level + num_levels) {
+         found = draw_aux_buffer_disabled[i] = true;
+      }
+   }
+
+   if (found) {
+      perf_debug(&ice->dbg,
+                 "Disabling CCS because a renderbuffer is also bound %s.\n",
+                 usage);
+   }
+
+   return found;
+}
+
 static void
-resolve_sampler_views(struct iris_batch *batch,
-                      struct iris_shader_state *shs)
+resolve_sampler_views(struct iris_context *ice,
+                      struct iris_batch *batch,
+                      struct iris_shader_state *shs,
+                      bool *draw_aux_buffer_disabled)
 {
    uint32_t views = shs->bound_sampler_views;
 
+   unsigned astc5x5_wa_bits = 0; // XXX: actual tracking
+
    while (views) {
       const int i = u_bit_scan(&views);
       struct iris_sampler_view *isv = shs->textures[i];
       struct iris_resource *res = (void *) isv->base.texture;
 
-      // XXX: aux tracking
+      if (batch->name != IRIS_BATCH_COMPUTE) {
+         disable_rb_aux_buffer(ice, draw_aux_buffer_disabled,
+                               res, isv->view.base_level, isv->view.levels,
+                               "for sampling");
+      }
+
+      iris_resource_prepare_texture(ice, batch, res, isv->view.format,
+                                    isv->view.base_level, isv->view.levels,
+                                    isv->view.base_array_layer,
+                                    isv->view.array_len,
+                                    astc5x5_wa_bits);
+
       iris_cache_flush_for_read(batch, res->bo);
    }
 }
 
 static void
-resolve_image_views(struct iris_batch *batch,
-                    struct iris_shader_state *shs)
+resolve_image_views(struct iris_context *ice,
+                    struct iris_batch *batch,
+                    struct iris_shader_state *shs,
+                    bool *draw_aux_buffer_disabled)
 {
    uint32_t views = shs->bound_image_views;
 
    while (views) {
       const int i = u_bit_scan(&views);
-      struct pipe_resource *res = shs->image[i].res;
+      struct iris_resource *res = (void *) shs->image[i].res;
+
+      if (batch->name != IRIS_BATCH_COMPUTE) {
+         disable_rb_aux_buffer(ice, draw_aux_buffer_disabled,
+                               res, 0, ~0, "as a shader image");
+      }
 
-      // XXX: aux tracking
-      iris_cache_flush_for_read(batch, iris_resource_bo(res));
+      iris_resource_prepare_image(ice, batch, res);
+
+      iris_cache_flush_for_read(batch, res->bo);
    }
 }
 
@@ -74,22 +141,35 @@ resolve_image_views(struct iris_batch *batch,
  * enabled depth texture, and flush the render cache for any dirty textures.
  */
 void
-iris_predraw_resolve_inputs(struct iris_batch *batch,
-                            struct iris_shader_state *shs)
+iris_predraw_resolve_inputs(struct iris_context *ice,
+                            struct iris_batch *batch,
+                            struct iris_shader_state *shs,
+                            bool *draw_aux_buffer_disabled)
 {
-   resolve_sampler_views(batch, shs);
-   resolve_image_views(batch, shs);
+   resolve_sampler_views(ice, batch, shs, draw_aux_buffer_disabled);
+   resolve_image_views(ice, batch, shs, draw_aux_buffer_disabled);
+
+   // XXX: ASTC hacks
 }
 
 void
 iris_predraw_resolve_framebuffer(struct iris_context *ice,
-                                 struct iris_batch *batch)
+                                 struct iris_batch *batch,
+                                 bool *draw_aux_buffer_disabled)
 {
    struct pipe_framebuffer_state *cso_fb = &ice->state.framebuffer;
    struct pipe_surface *zs_surf = cso_fb->zsbuf;
 
    if (zs_surf) {
-      // XXX: HiZ resolves
+      struct iris_resource *z_res, *s_res;
+      iris_get_depth_stencil_resources(zs_surf->texture, &z_res, &s_res);
+      unsigned num_layers =
+         zs_surf->u.tex.last_layer - zs_surf->u.tex.first_layer + 1;
+
+      if (z_res) {
+         iris_resource_prepare_depth(ice, batch, z_res, zs_surf->u.tex.level,
+                                     zs_surf->u.tex.first_layer, num_layers);
+      }
    }
 
    for (unsigned i = 0; i < cso_fb->nr_cbufs; i++) {
@@ -99,7 +179,18 @@ iris_predraw_resolve_framebuffer(struct iris_context *ice,
 
       struct iris_resource *res = (void *) surf->base.texture;
 
-      // XXX: aux tracking
+      enum isl_aux_usage aux_usage =
+         iris_resource_render_aux_usage(ice, res, surf->view.format,
+                                        ice->state.blend_enables & (1u << i),
+                                        draw_aux_buffer_disabled[i]);
+
+      // XXX: NEW_AUX_STATE
+      ice->state.draw_aux_usage[i] = aux_usage;
+
+      iris_resource_prepare_render(ice, batch, res, surf->view.base_level,
+                                   surf->view.base_array_layer,
+                                   surf->view.array_len,
+                                   aux_usage);
 
       iris_cache_flush_for_render(batch, res->bo, surf->view.format,
                                   ISL_AUX_USAGE_NONE);
@@ -130,16 +221,22 @@ iris_postdraw_update_resolve_tracking(struct iris_context *ice,
    if (zs_surf) {
       struct iris_resource *z_res, *s_res;
       iris_get_depth_stencil_resources(zs_surf->texture, &z_res, &s_res);
+      unsigned num_layers =
+         zs_surf->u.tex.last_layer - zs_surf->u.tex.first_layer + 1;
 
       if (z_res) {
-         // XXX: aux tracking
+         iris_resource_finish_depth(ice, z_res, zs_surf->u.tex.level,
+                                    zs_surf->u.tex.first_layer, num_layers,
+                                    ice->state.depth_writes_enabled);
 
          if (ice->state.depth_writes_enabled)
             iris_depth_cache_add_bo(batch, z_res->bo);
       }
 
       if (s_res) {
-         // XXX: aux tracking
+         iris_resource_finish_write(ice, s_res, zs_surf->u.tex.level,
+                                    zs_surf->u.tex.first_layer, num_layers,
+                                    ISL_AUX_USAGE_NONE);
 
          if (ice->state.stencil_writes_enabled)
             iris_depth_cache_add_bo(batch, s_res->bo);
@@ -152,10 +249,15 @@ iris_postdraw_update_resolve_tracking(struct iris_context *ice,
          continue;
 
       struct iris_resource *res = (void *) surf->base.texture;
+      union pipe_surface_desc *desc = &surf->base.u;
+      unsigned num_layers = desc->tex.last_layer - desc->tex.first_layer + 1;
+      enum isl_aux_usage aux_usage = ice->state.draw_aux_usage[i];
+
+      iris_render_cache_add_bo(batch, res->bo, surf->view.format, aux_usage);
 
-      // XXX: aux tracking
-      iris_render_cache_add_bo(batch, res->bo, surf->view.format,
-                               ISL_AUX_USAGE_NONE);
+      iris_resource_finish_render(ice, res, desc->tex.level,
+                                  desc->tex.first_layer, num_layers,
+                                  aux_usage);
    }
 }
 
@@ -287,6 +389,68 @@ iris_depth_cache_add_bo(struct iris_batch *batch, struct iris_bo *bo)
    _mesa_set_add_pre_hashed(batch->cache.depth, bo->hash, bo);
 }
 
+static void
+iris_resolve_color(struct iris_context *ice,
+                   struct iris_batch *batch,
+                   struct iris_resource *res,
+                   unsigned level, unsigned layer,
+                   enum isl_aux_op resolve_op)
+{
+   //DBG("%s to mt %p level %u layer %u\n", __FUNCTION__, mt, level, layer);
+
+   struct blorp_surf surf;
+   iris_blorp_surf_for_resource(&surf, &res->base, res->aux.usage, true);
+
+   iris_batch_maybe_flush(batch, 1500);
+
+   /* Ivybridge PRM Vol 2, Part 1, "11.7 MCS Buffer for Render Target(s)":
+    *
+    *    "Any transition from any value in {Clear, Render, Resolve} to a
+    *     different value in {Clear, Render, Resolve} requires end of pipe
+    *     synchronization."
+    *
+    * In other words, fast clear ops are not properly synchronized with
+    * other drawing.  We need to use a PIPE_CONTROL to ensure that the
+    * contents of the previous draw hit the render target before we resolve
+    * and again afterwards to ensure that the resolve is complete before we
+    * do any more regular drawing.
+    */
+   iris_emit_end_of_pipe_sync(batch, PIPE_CONTROL_RENDER_TARGET_FLUSH);
+
+   struct blorp_batch blorp_batch;
+   blorp_batch_init(&ice->blorp, &blorp_batch, batch, 0);
+   blorp_ccs_resolve(&blorp_batch, &surf, level, layer, 1,
+                     isl_format_srgb_to_linear(res->surf.format),
+                     resolve_op);
+   blorp_batch_finish(&blorp_batch);
+
+   /* See comment above */
+   iris_emit_end_of_pipe_sync(batch, PIPE_CONTROL_RENDER_TARGET_FLUSH);
+}
+
+static void
+iris_mcs_partial_resolve(struct iris_context *ice,
+                         struct iris_batch *batch,
+                         struct iris_resource *res,
+                         uint32_t start_layer,
+                         uint32_t num_layers)
+{
+   //DBG("%s to mt %p layers %u-%u\n", __FUNCTION__, mt,
+       //start_layer, start_layer + num_layers - 1);
+
+   assert(res->aux.usage == ISL_AUX_USAGE_MCS);
+
+   struct blorp_surf surf;
+   iris_blorp_surf_for_resource(&surf, &res->base, res->aux.usage, true);
+
+   struct blorp_batch blorp_batch;
+   blorp_batch_init(&ice->blorp, &blorp_batch, batch, 0);
+   blorp_mcs_partial_resolve(&blorp_batch, &surf, res->surf.format,
+                             start_layer, num_layers);
+   blorp_batch_finish(&blorp_batch);
+}
+
+
 /**
  * Return true if the format that will be used to access the resource is
  * CCS_E-compatible with the resource's linear/non-sRGB format.
@@ -504,6 +668,7 @@ get_ccs_e_resolve_op(enum isl_aux_state aux_state,
 
 static void
 iris_resource_prepare_ccs_access(struct iris_context *ice,
+                                 struct iris_batch *batch,
                                  struct iris_resource *res,
                                  uint32_t level, uint32_t layer,
                                  enum isl_aux_usage aux_usage,
@@ -522,7 +687,7 @@ iris_resource_prepare_ccs_access(struct iris_context *ice,
    }
 
    if (resolve_op != ISL_AUX_OP_NONE) {
-      // XXX: iris_blorp_resolve_color(ice, res, level, layer, resolve_op);
+      iris_resolve_color(ice, batch, res, level, layer, resolve_op);
 
       switch (resolve_op) {
       case ISL_AUX_OP_FULL_RESOLVE:
@@ -621,6 +786,7 @@ iris_resource_finish_ccs_write(struct iris_context *ice,
 
 static void
 iris_resource_prepare_mcs_access(struct iris_context *ice,
+                                 struct iris_batch *batch,
                                  struct iris_resource *res,
                                  uint32_t layer,
                                  enum isl_aux_usage aux_usage,
@@ -632,7 +798,7 @@ iris_resource_prepare_mcs_access(struct iris_context *ice,
    case ISL_AUX_STATE_CLEAR:
    case ISL_AUX_STATE_COMPRESSED_CLEAR:
       if (!fast_clear_supported) {
-         // XXX: iris_blorp_mcs_partial_resolve(ice, res, layer, 1);
+         iris_mcs_partial_resolve(ice, batch, res, layer, 1);
          iris_resource_set_aux_state(res, 0, layer, 1,
                                      ISL_AUX_STATE_COMPRESSED_NO_CLEAR);
       }
@@ -677,6 +843,7 @@ iris_resource_finish_mcs_write(struct iris_context *ice,
 
 static void
 iris_resource_prepare_hiz_access(struct iris_context *ice,
+                                 struct iris_batch *batch,
                                  struct iris_resource *res,
                                  uint32_t level, uint32_t layer,
                                  enum isl_aux_usage aux_usage,
@@ -780,6 +947,7 @@ iris_resource_finish_hiz_write(struct iris_context *ice,
 
 void
 iris_resource_prepare_access(struct iris_context *ice,
+                             struct iris_batch *batch,
                              struct iris_resource *res,
                              uint32_t start_level, uint32_t num_levels,
                              uint32_t start_layer, uint32_t num_layers,
@@ -798,7 +966,7 @@ iris_resource_prepare_access(struct iris_context *ice,
       const uint32_t level_layers =
          miptree_layer_range_length(res, 0, start_layer, num_layers);
       for (uint32_t a = 0; a < level_layers; a++) {
-         iris_resource_prepare_mcs_access(ice, res, start_layer + a,
+         iris_resource_prepare_mcs_access(ice, batch, res, start_layer + a,
                                           aux_usage, fast_clear_supported);
       }
       break;
@@ -810,7 +978,7 @@ iris_resource_prepare_access(struct iris_context *ice,
          const uint32_t level_layers =
             miptree_layer_range_length(res, level, start_layer, num_layers);
          for (uint32_t a = 0; a < level_layers; a++) {
-            iris_resource_prepare_ccs_access(ice, res, level,
+            iris_resource_prepare_ccs_access(ice, batch, res, level,
                                              start_layer + a,
                                              aux_usage, fast_clear_supported);
          }
@@ -826,8 +994,9 @@ iris_resource_prepare_access(struct iris_context *ice,
          const uint32_t level_layers =
             miptree_layer_range_length(res, level, start_layer, num_layers);
          for (uint32_t a = 0; a < level_layers; a++) {
-            iris_resource_prepare_hiz_access(ice, res, level, start_layer + a,
-                                             aux_usage, fast_clear_supported);
+            iris_resource_prepare_hiz_access(ice, batch, res, level,
+                                             start_layer + a, aux_usage,
+                                             fast_clear_supported);
          }
       }
       break;
@@ -1025,6 +1194,7 @@ isl_formats_are_fast_clear_compatible(enum isl_format a, enum isl_format b)
 
 void
 iris_resource_prepare_texture(struct iris_context *ice,
+                              struct iris_batch *batch,
                               struct iris_resource *res,
                               enum isl_format view_format,
                               uint32_t start_level, uint32_t num_levels,
@@ -1043,17 +1213,18 @@ iris_resource_prepare_texture(struct iris_context *ice,
    if (!isl_formats_are_fast_clear_compatible(res->surf.format, view_format))
       clear_supported = false;
 
-   iris_resource_prepare_access(ice, res, start_level, num_levels,
+   iris_resource_prepare_access(ice, batch, res, start_level, num_levels,
                                 start_layer, num_layers,
                                 aux_usage, clear_supported);
 }
 
 void
 iris_resource_prepare_image(struct iris_context *ice,
+                            struct iris_batch *batch,
                             struct iris_resource *res)
 {
    /* The data port doesn't understand any compression */
-   iris_resource_prepare_access(ice, res, 0, INTEL_REMAINING_LEVELS,
+   iris_resource_prepare_access(ice, batch, res, 0, INTEL_REMAINING_LEVELS,
                                 0, INTEL_REMAINING_LAYERS,
                                 ISL_AUX_USAGE_NONE, false);
 }
@@ -1102,12 +1273,14 @@ iris_resource_render_aux_usage(struct iris_context *ice,
 
 void
 iris_resource_prepare_render(struct iris_context *ice,
+                             struct iris_batch *batch,
                              struct iris_resource *res, uint32_t level,
                              uint32_t start_layer, uint32_t layer_count,
                              enum isl_aux_usage aux_usage)
 {
-   iris_resource_prepare_access(ice, res, level, 1, start_layer, layer_count,
-                                aux_usage, aux_usage != ISL_AUX_USAGE_NONE);
+   iris_resource_prepare_access(ice, batch, res, level, 1, start_layer,
+                                layer_count, aux_usage,
+                                aux_usage != ISL_AUX_USAGE_NONE);
 }
 
 void
@@ -1122,11 +1295,12 @@ iris_resource_finish_render(struct iris_context *ice,
 
 void
 iris_resource_prepare_depth(struct iris_context *ice,
+                            struct iris_batch *batch,
                             struct iris_resource *res, uint32_t level,
                             uint32_t start_layer, uint32_t layer_count)
 {
-   iris_resource_prepare_access(ice, res, level, 1, start_layer, layer_count,
-                                res->aux.usage, res->aux.bo != NULL);
+   iris_resource_prepare_access(ice, batch, res, level, 1, start_layer,
+                                layer_count, res->aux.usage, !!res->aux.bo);
 }
 
 void
diff --git a/src/gallium/drivers/iris/iris_resource.h b/src/gallium/drivers/iris/iris_resource.h
index c17ed42ada2..c31f70ba058 100644
--- a/src/gallium/drivers/iris/iris_resource.h
+++ b/src/gallium/drivers/iris/iris_resource.h
@@ -233,6 +233,7 @@ void iris_resource_disable_aux(struct iris_resource *res);
  */
 void
 iris_resource_prepare_access(struct iris_context *ice,
+                             struct iris_batch *batch,
                              struct iris_resource *res,
                              uint32_t start_level, uint32_t num_levels,
                              uint32_t start_layer, uint32_t num_layers,
@@ -294,11 +295,12 @@ iris_resource_set_aux_state(struct iris_resource *res, uint32_t level,
  */
 static inline void
 iris_resource_access_raw(struct iris_context *ice,
+                         struct iris_batch *batch,
                          struct iris_resource *res,
                          uint32_t level, uint32_t layer,
                          bool write)
 {
-   iris_resource_prepare_access(ice, res, level, 1, layer, 1,
+   iris_resource_prepare_access(ice, batch, res, level, 1, layer, 1,
                                 ISL_AUX_USAGE_NONE, false);
    if (write)
       iris_resource_finish_write(ice, res, level, layer, 1, ISL_AUX_USAGE_NONE);
@@ -309,12 +311,14 @@ enum isl_aux_usage iris_resource_texture_aux_usage(struct iris_context *ice,
                                                    enum isl_format view_fmt,
                                                    enum gen9_astc5x5_wa_tex_type);
 void iris_resource_prepare_texture(struct iris_context *ice,
+                                   struct iris_batch *batch,
                                    struct iris_resource *res,
                                    enum isl_format view_format,
                                    uint32_t start_level, uint32_t num_levels,
                                    uint32_t start_layer, uint32_t num_layers,
                                    enum gen9_astc5x5_wa_tex_type);
 void iris_resource_prepare_image(struct iris_context *ice,
+                                 struct iris_batch *batch,
                                  struct iris_resource *res);
 
 void iris_resource_check_level_layer(const struct iris_resource *res,
@@ -329,6 +333,7 @@ enum isl_aux_usage iris_resource_render_aux_usage(struct iris_context *ice,
                                                   bool blend_enabled,
                                                   bool draw_aux_disabled);
 void iris_resource_prepare_render(struct iris_context *ice,
+                                  struct iris_batch *batch,
                                   struct iris_resource *res, uint32_t level,
                                   uint32_t start_layer, uint32_t layer_count,
                                   enum isl_aux_usage aux_usage);
@@ -337,6 +342,7 @@ void iris_resource_finish_render(struct iris_context *ice,
                                  uint32_t start_layer, uint32_t layer_count,
                                  enum isl_aux_usage aux_usage);
 void iris_resource_prepare_depth(struct iris_context *ice,
+                                 struct iris_batch *batch,
                                  struct iris_resource *res, uint32_t level,
                                  uint32_t start_layer, uint32_t layer_count);
 void iris_resource_finish_depth(struct iris_context *ice,