From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 20 Jun 2018 06:37:10 +0000 (-0700)
Subject: iris: avoid crashing on unbound constant resources
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=26db2ea782eb52ad80739d73a8f4882eee576bda;p=mesa.git

iris: avoid crashing on unbound constant resources

instead, read from the workaround BO
---

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index baa27e7cd49..1dc761caff6 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -2290,7 +2290,10 @@ iris_restore_context_saved_bos(struct iris_context *ice,
          struct iris_const_buffer *cbuf = &shs->constbuf[range->block];
          struct iris_resource *res = (void *) cbuf->resource;
 
-         iris_use_pinned_bo(batch, res->bo, false);
+         if (res)
+            iris_use_pinned_bo(batch, res->bo, false);
+         else
+            iris_use_pinned_bo(batch, batch->screen->workaround_bo, false);
       }
    }
 
@@ -2467,7 +2470,8 @@ iris_upload_render_state(struct iris_context *ice,
 
                pkt.ConstantBody.ReadLength[n] = range->length;
                pkt.ConstantBody.Buffer[n] =
-                  ro_bo(res->bo, range->start * 32 + cbuf->offset);
+                  res ? ro_bo(res->bo, range->start * 32 + cbuf->offset)
+                      : ro_bo(batch->screen->workaround_bo, 0);
                n--;
             }
          }