From 94f9c5fff672cf00843b2522aeee01effbb2afc8 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Tue, 3 Sep 2019 08:03:13 -0700 Subject: [PATCH] iris: Make iris_emit_default_l3_config pull devinfo from the batch MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit No need to pass it, we can just use batch->screen->devinfo. Reviewed-by: Tapani Pälli Part-of: --- src/gallium/drivers/iris/iris_state.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index 1b856335f61..00baa4ba312 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -767,10 +767,9 @@ iris_emit_l3_config(struct iris_batch *batch, const struct gen_l3_config *cfg, } static void -iris_emit_default_l3_config(struct iris_batch *batch, - const struct gen_device_info *devinfo, - bool compute) +iris_emit_default_l3_config(struct iris_batch *batch, bool compute) { + const struct gen_device_info *devinfo = &batch->screen->devinfo; bool wants_dc_cache = true; bool has_slm = compute; const struct gen_l3_weights w = @@ -913,7 +912,7 @@ iris_init_render_context(struct iris_batch *batch) emit_pipeline_select(batch, _3D); - iris_emit_default_l3_config(batch, devinfo, false); + iris_emit_default_l3_config(batch, false); init_state_base_address(batch); @@ -1032,7 +1031,7 @@ iris_init_compute_context(struct iris_batch *batch) emit_pipeline_select(batch, GPGPU); #endif - iris_emit_default_l3_config(batch, devinfo, true); + iris_emit_default_l3_config(batch, true); init_state_base_address(batch); -- 2.30.2