From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 7 Jun 2018 07:23:23 +0000 (-0700)
Subject: iris: fix pull bufs that aren't the first user upload
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=48dc8bd4b00854459a7c735b8b3fb1a32cdccf0e;p=mesa.git

iris: fix pull bufs that aren't the first user upload
---

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index d47c90f32fb..dcf5c62f9a8 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -1373,7 +1373,7 @@ iris_set_constant_buffer(struct pipe_context *ctx,
       cbuf->surface_state_offset += iris_bo_offset_from_base_address(surf_bo);
 
       isl_buffer_fill_state(&screen->isl_dev, map,
-                            .address = res->bo->gtt_offset,
+                            .address = res->bo->gtt_offset + cbuf->offset,
                             .size_B = input->buffer_size,
                             .format = ISL_FORMAT_R32G32B32A32_FLOAT,
                             .stride_B = 1,