Mesa (staging/22.0): anv: fix invalid utrace memcpy l3 config on gfx < 11

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: 92ec46814a0703aefd35136bcf2cf71a5d268d5f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=92ec46814a0703aefd35136bcf2cf71a5d268d5f

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Tue May  3 12:19:43 2022 +0300

anv: fix invalid utrace memcpy l3 config on gfx < 11

device->l3_config is only valid on Gfx11+

This only fixes using GPU_TRACE=1

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Fixes: 02a4d622ed0 ("anv: expose a couple of emit helper to build utrace buffer copies")
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16291>
(cherry picked from commit 4efc99747247520f186365c530a4f955cbc1fb79)

---

 .pick_status.json                  | 2 +-
 src/intel/vulkan/genX_gpu_memcpy.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 4e26596df11..99bb27e36d3 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -148,7 +148,7 @@
         "description": "anv: fix invalid utrace memcpy l3 config on gfx < 11",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": "02a4d622ed08ff7f02cb5c4e7476d99fb7ebc127"
     },
     {
diff --git a/src/intel/vulkan/genX_gpu_memcpy.c b/src/intel/vulkan/genX_gpu_memcpy.c
index af353ca69e1..82fc2dcc721 100644
--- a/src/intel/vulkan/genX_gpu_memcpy.c
+++ b/src/intel/vulkan/genX_gpu_memcpy.c
@@ -255,7 +255,7 @@ genX(emit_so_memcpy_init)(struct anv_memcpy_state *state,
       ps.PipelineSelection = _3D;
    }
 
-   emit_common_so_memcpy(batch, device, device->l3_config);
+   emit_common_so_memcpy(batch, device, cfg);
 }
 
 void