summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <lionel.g.landwerlin@intel.com>2022-05-03 12:19:43 +0300
committerDylan Baker <dylan.c.baker@intel.com>2022-05-03 09:41:32 -0700
commit381ec467dba1b1eec8b437aeef14b23250b98b0b (patch)
tree15dc43bad57f056f91a48cae193a3224ef837069
parent9b60b2ecdc02723159c84e2f44267dd29984262c (diff)
downloadmesa-381ec467dba1b1eec8b437aeef14b23250b98b0b.tar.gz
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@intel.com> Fixes: 02a4d622ed0 ("anv: expose a couple of emit helper to build utrace buffer copies") Reviewed-by: Tapani Pälli <tapani.palli@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16291> (cherry picked from commit 4efc99747247520f186365c530a4f955cbc1fb79)
-rw-r--r--.pick_status.json2
-rw-r--r--src/intel/vulkan/genX_gpu_memcpy.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 2576537c3c8..b65d4175f34 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -166,7 +166,7 @@
"description": "anv: fix invalid utrace memcpy l3 config on gfx < 11",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"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