From: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon, 19 Nov 2018 08:23:54 +0000 (-0800)
Subject: iris: properly pin stencil buffers
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=25a41b1aef7ed3463111a0e36f0a2a8405908557;p=mesa.git

iris: properly pin stencil buffers
---

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 2b632ab3cba..caf1f4e445a 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -4277,9 +4277,14 @@ iris_upload_dirty_render_state(struct iris_context *ice,
       iris_batch_emit(batch, cso_z->packets, sizeof(cso_z->packets));
 
       if (cso_fb->zsbuf) {
-         struct iris_resource *zres = (void *) cso_fb->zsbuf->texture;
-         // XXX: depth might not be writable...
-         iris_use_pinned_bo(batch, zres->bo, true);
+         struct iris_resource *zres, *sres;
+         iris_get_depth_stencil_resources(cso_fb->zsbuf->texture,
+                                          &zres, &sres);
+         // XXX: might not be writable...
+         if (zres)
+            iris_use_pinned_bo(batch, zres->bo, true);
+         if (sres)
+            iris_use_pinned_bo(batch, sres->bo, true);
       }
    }