From cda0b0c9f8363a65066d2ebaf28d35c77dd97e97 Mon Sep 17 00:00:00 2001 From: Calder Young Date: Thu, 9 Apr 2026 14:32:22 -0700 Subject: [PATCH] anv: Fix address bit masking for indirect SBTs Fixes: ce68824 ("anv: fix invalid masking of 48bit address") Part-of: (cherry picked from commit 8f7309d9a9053dfa441eb52f131de096303bca7f) --- .pick_status.json | 2 +- src/intel/vulkan/genX_cmd_compute.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 156019bd12a..dd840c4c720 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2134,7 +2134,7 @@ "description": "anv: Fix address bit masking for indirect SBTs", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "ce68824bdfb05379f0e682165588528a11b05214", "notes": null diff --git a/src/intel/vulkan/genX_cmd_compute.c b/src/intel/vulkan/genX_cmd_compute.c index 5d887b886c6..d51912bd714 100644 --- a/src/intel/vulkan/genX_cmd_compute.c +++ b/src/intel/vulkan/genX_cmd_compute.c @@ -1037,7 +1037,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(BITFIELD64_BIT(49) - 1)), + mi_imm(BITFIELD64_MASK(48))), mi_ishl_imm(b, mi_mem32(anv_address_from_u64(stride_field_addr)), 48)); }