Module: Mesa Branch: main Commit: b9a38a16619a5ed9f840b32bab6463c17163cff8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b9a38a16619a5ed9f840b32bab6463c17163cff8
Author: José Roberto de Souza <[email protected]> Date: Mon Jul 10 10:42:43 2023 -0700 intel/aux_map: Convert l1_entry_addr_out to canonical The expression 'l1_gpu_addr + l1_index * sizeof(*l1_map)' could cause bit 47 to be set so it needs to be converted to canonical. Signed-off-by: José Roberto de Souza <[email protected]> Reviewed-by: Lionel Landwerlin <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24077> --- src/intel/common/intel_aux_map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/intel/common/intel_aux_map.c b/src/intel/common/intel_aux_map.c index b023ce03a09..b302d905f4e 100644 --- a/src/intel/common/intel_aux_map.c +++ b/src/intel/common/intel_aux_map.c @@ -532,7 +532,7 @@ get_aux_entry(struct intel_aux_map_context *ctx, uint64_t main_address, if (l1_index_out) *l1_index_out = l1_index; if (l1_entry_addr_out) - *l1_entry_addr_out = l1_addr + l1_index * sizeof(*l1_map); + *l1_entry_addr_out = intel_canonical_address(l1_addr + l1_index * sizeof(*l1_map)); if (l1_entry_map_out) *l1_entry_map_out = &l1_map[l1_index]; }
