From 4ad5b8f5bbe0f7dbc8e9debff76b79cd9ff76a79 Mon Sep 17 00:00:00 2001 From: "Ivan A. Melnikov" Date: Fri, 7 Mar 2025 19:29:31 +0400 Subject: [PATCH] gallium/radeon: Make sure radeonsi PCI IDs are also included When importing libdrm_radeon code [1][2] it was somehow missed that what libdrm has in one r600_pci_ids.h, Mesa has split into r600_pci_ids.h and radeonsi_pci_ids.h. So, devices with ids from radeonsi_pci_ids.h were not considered valid for radeon_surface_manager_new. This commit changes that, thus fixing radeonsi for these devices. [1] commit 1299f5c50a490fadeb60b61677596f13399ee136 [2] commit 3aa7497cc0bb52c8099fb07b27f9aee5e18e58ca Fixes: 1299f5c50a490fadeb60b61677596f13399ee136 Signed-off-by: Ivan A. Melnikov Part-of: --- src/gallium/winsys/radeon/drm/radeon_surface.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gallium/winsys/radeon/drm/radeon_surface.c b/src/gallium/winsys/radeon/drm/radeon_surface.c index 8a3302df684..3c469ad0c6e 100644 --- a/src/gallium/winsys/radeon/drm/radeon_surface.c +++ b/src/gallium/winsys/radeon/drm/radeon_surface.c @@ -132,6 +132,9 @@ static int radeon_get_family(struct radeon_surface_manager *surf_man) switch (surf_man->device_id) { #define CHIPSET(pci_id, name, fam) case pci_id: surf_man->family = CHIP_##fam; break; #include "pci_ids/r600_pci_ids.h" +#undef CHIPSET +#define CHIPSET(pci_id, fam) case pci_id: surf_man->family = CHIP_##fam; break; +#include "pci_ids/radeonsi_pci_ids.h" #undef CHIPSET default: return -EINVAL;