From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 13 Jun 2018 10:06:50 +0000 (-0700)
Subject: iris: untested SAMPLER_STATE pin BO fix
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=149408a36031a32b376e3d6d86fa6958295080b1;p=mesa.git

iris: untested SAMPLER_STATE pin BO fix
---

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index c7517f2c2cd..76481b4ccde 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -2354,6 +2354,10 @@ iris_upload_render_state(struct iris_context *ice,
           !ice->shaders.prog[stage])
          continue;
 
+      struct pipe_resource *res = ice->state.sampler_table_resource[stage];
+      if (res)
+         iris_use_pinned_bo(batch, iris_resource_bo(res), false);
+
       iris_emit_cmd(batch, GENX(3DSTATE_SAMPLER_STATE_POINTERS_VS), ptr) {
          ptr._3DCommandSubOpcode = 43 + stage;
          ptr.PointertoVSSamplerState = ice->state.sampler_table_offset[stage];