From: Kenneth Graunke <kenneth@whitecape.org>
Date: Fri, 21 Dec 2018 09:00:34 +0000 (-0800)
Subject: iris: Fix compute scratch pinning
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=73709be0c32601952b6902d83ec4541fb9f73cd9;p=mesa.git

iris: Fix compute scratch pinning

Thanks to Eero Tamminen for helping catch this.
---

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 9acb7bd65bf..a8d644eeae6 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -4713,9 +4713,8 @@ iris_upload_compute_state(struct iris_context *ice,
             struct iris_bo *bo =
                iris_get_scratch_space(ice, prog_data->total_scratch,
                                       MESA_SHADER_COMPUTE);
-            uint32_t scratch_addr = bo->gtt_offset;
             vfe.PerThreadScratchSpace = ffs(prog_data->total_scratch) - 11;
-            vfe.ScratchSpaceBasePointer = rw_bo(NULL, scratch_addr);
+            vfe.ScratchSpaceBasePointer = rw_bo(bo, 0);
          }
 
          vfe.MaximumNumberofThreads =