From 31fc3199ddbcc97547b1e6fd6edfa90528afc73b Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Thu, 31 Oct 2024 15:58:08 +0100
Subject: [PATCH] radv: fix dumping the faulty shader detected by the trap
 handler on GFX9+

The most significant bits need to be cleared.

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

diff --git a/src/amd/vulkan/radv_debug.c b/src/amd/vulkan/radv_debug.c
index 39aaee48bd6..65480379434 100644
--- a/src/amd/vulkan/radv_debug.c
+++ b/src/amd/vulkan/radv_debug.c
@@ -944,6 +944,7 @@ radv_dump_faulty_shader(struct radv_device *device, uint64_t faulty_pc)
       return;
 
    start_addr = radv_shader_get_va(shader);
+   start_addr &= ((1ull << 48) - 1);
    end_addr = start_addr + shader->code_size;
    instr_offset = faulty_pc - start_addr;