From: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon, 19 Nov 2018 19:22:56 +0000 (-0800)
Subject: iris: Fix SLM
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1b69b14c2a20932fe59d2d48ff398be28a313a33;p=mesa.git

iris: Fix SLM

Now that Jason has set up the L3 we can do this.  Also, my assert was
useless because we hadn't set up the field in the first place.  Oops.
---

diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c
index f4c396465e8..9d28307fed4 100644
--- a/src/gallium/drivers/iris/iris_program.c
+++ b/src/gallium/drivers/iris/iris_program.c
@@ -1138,6 +1138,8 @@ iris_compile_cs(struct iris_context *ice,
 
    cs_prog_data->binding_table.work_groups_start = 0;
 
+   prog_data->total_shared = nir->info.cs.shared_size;
+
    iris_setup_uniforms(compiler, mem_ctx, nir, prog_data, &system_values,
                        &num_system_values);
 
diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 7d4ff7365ea..a21fcc17dca 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -4514,9 +4514,6 @@ iris_upload_compute_state(struct iris_context *ice,
    struct brw_stage_prog_data *prog_data = shader->prog_data;
    struct brw_cs_prog_data *cs_prog_data = (void *) prog_data;
 
-   // XXX: L3 configuration not set up for SLM
-   assert(prog_data->total_shared == 0);
-
    if ((dirty & IRIS_DIRTY_CONSTANTS_CS) && shs->cbuf0_needs_upload)
       upload_uniforms(ice, MESA_SHADER_COMPUTE);