Module: Mesa Branch: staging/23.0 Commit: 7c90f3a42fb1d9d9e94a9aff23427774e6666f8b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c90f3a42fb1d9d9e94a9aff23427774e6666f8b
Author: Lionel Landwerlin <[email protected]> Date: Thu Feb 23 13:02:11 2023 +0200 anv: fix invalid masking of 48bit address Signed-off-by: Lionel Landwerlin <[email protected]> Fixes: 4d05be49c253 ("anv: implement vkCmdTraceRaysIndirect2KHR") Reviewed-by: José Roberto de Souza <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21486> (cherry picked from commit ce68824bdfb05379f0e682165588528a11b05214) --- .pick_status.json | 2 +- src/intel/vulkan/genX_cmd_buffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index cc6724ba540..4405dbe0720 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -58,7 +58,7 @@ "description": "anv: fix invalid masking of 48bit address", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "4d05be49c253ecd7a5803ccaeee8c9238af24326" }, diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 25d33794589..f8ccb9abab1 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -5970,7 +5970,7 @@ mi_build_sbt_entry(struct mi_builder *b, { return mi_ior(b, mi_iand(b, mi_mem64(anv_address_from_u64(addr_field_addr)), - mi_imm(0xffffffffff)), + mi_imm(BITFIELD64_BIT(49) - 1)), mi_ishl_imm(b, mi_mem32(anv_address_from_u64(stride_field_addr)), 48)); }
