Mesa (master): iris: Make iris_emit_default_l3_config pull devinfo from the batch

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 94f9c5fff672cf00843b2522aeee01effbb2afc8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=94f9c5fff672cf00843b2522aeee01effbb2afc8

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Tue Sep  3 08:03:13 2019 -0700

iris: Make iris_emit_default_l3_config pull devinfo from the batch

No need to pass it, we can just use batch->screen->devinfo.

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3613>

---

 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);