From 691371a176d9fd9ea16eb472c3986d41cab25bcd Mon Sep 17 00:00:00 2001 From: Andrzej Datczuk Date: Thu, 14 May 2026 14:49:54 +0200 Subject: [PATCH] radv/rra,rmv: fix device id written into trace files Both RRA and RMV used the PCI bus slot index in the trace device_id field. On a typical single-GPU system, this resulted in "Device ID = 0000" displayed in RRA and RMV when traces were opened. Match RGP dump, which reports device ids correctly. Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_rmv.c | 2 +- src/amd/vulkan/radv_rra.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_rmv.c b/src/amd/vulkan/radv_rmv.c index 9f051e903ec..e5d5125ea55 100644 --- a/src/amd/vulkan/radv_rmv.c +++ b/src/amd/vulkan/radv_rmv.c @@ -426,7 +426,7 @@ radv_rmv_fill_device_info(const struct radv_physical_device *pdev, struct vk_rmv strncpy(info->device_name, gpu_info->marketing_name, sizeof(info->device_name) - 1); info->pcie_family_id = gpu_info->family_id; info->pcie_revision_id = gpu_info->pci_rev_id; - info->pcie_device_id = gpu_info->pci.dev; + info->pcie_device_id = gpu_info->pci_id; info->minimum_shader_clock = 0; info->maximum_shader_clock = gpu_info->max_gpu_freq_mhz; info->vram_type = memory_type_from_vram_type(gpu_info->vram_type); diff --git a/src/amd/vulkan/radv_rra.c b/src/amd/vulkan/radv_rra.c index d1af7ecdc28..dde5d8e8bfc 100644 --- a/src/amd/vulkan/radv_rra.c +++ b/src/amd/vulkan/radv_rra.c @@ -173,7 +173,7 @@ rra_dump_asic_info(const struct radeon_info *gpu_info, FILE *output) .mem_ops_per_clk = ac_memory_ops_per_clock(gpu_info->vram_type), .bus_width = gpu_info->memory_bus_width, - .device_id = gpu_info->pci.dev, + .device_id = gpu_info->pci_id, .rev_id = gpu_info->pci_rev_id, };