diff --git a/.pick_status.json b/.pick_status.json
index 8245fb62f49..47e6f4d7abb 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2564,7 +2564,7 @@
         "description": "radv: use canonicalized VA for VM fault reports",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/amd/vulkan/radv_debug.c b/src/amd/vulkan/radv_debug.c
index 34433384062..97322bbd5e9 100644
--- a/src/amd/vulkan/radv_debug.c
+++ b/src/amd/vulkan/radv_debug.c
@@ -1081,7 +1081,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 */
       };