From 7f608fc206e8f6ad0d4fdf7992ac211d9f64144e Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Tue, 9 Apr 2024 16:19:45 +0200
Subject: [PATCH] radv: use canonicalized VA for VM fault reports

Otherwise, the returned VA from vkGetBufferDeviceAddress() or via
VK_EXT_device_address_binding_report doesn't match and applications
would have to mask out.

Cc: mesa-stable
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28652>
---
 src/amd/vulkan/radv_debug.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_debug.c b/src/amd/vulkan/radv_debug.c
index 48643f891be..8c0562de2a2 100644
--- a/src/amd/vulkan/radv_debug.c
+++ b/src/amd/vulkan/radv_debug.c
@@ -1124,7 +1124,7 @@ radv_GetDeviceFaultInfoEXT(VkDevice _device, VkDeviceFaultCountsEXT *pFaultCount
 
    if (vm_fault_occurred) {
       VkDeviceFaultAddressInfoEXT addr_fault_info = {
-         .reportedAddress = fault_info.addr,
+         .reportedAddress = ((int64_t)fault_info.addr << 16) >> 16,
          .addressPrecision = 4096, /* 4K page granularity */
       };