From d69fd22b6d13052d667929a0e3db61829ce1396e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Wed, 26 Oct 2016 18:36:18 +0900 Subject: Stop using AMDGPU(Unique)Chipsets Use libdrm_amdgpu's amdgpu_get_marketing_name for the chipset name, or "Unknown AMD Radeon GPU" as a fallback. v2: Require libdrm_amdgpu >= 2.4.72 for amdgpu_get_marketing_name Reviewed-by: Alex Deucher (v1) --- src/amdgpu_probe.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/amdgpu_probe.c') diff --git a/src/amdgpu_probe.c b/src/amdgpu_probe.c index 6efa3fb..94da7f6 100644 --- a/src/amdgpu_probe.c +++ b/src/amdgpu_probe.c @@ -58,9 +58,6 @@ #include #endif -#include "ati_pciids_gen.h" -#include "amdgpu_chipset_gen.h" - _X_EXPORT int gAMDGPUEntityIndex = -1; /* Return the options for supported chipset 'n'; NULL otherwise */ @@ -69,11 +66,15 @@ static const OptionInfoRec *AMDGPUAvailableOptions(int chipid, int busid) return AMDGPUOptionsWeak(); } +static SymTabRec AMDGPUAny[] = { + { 0, "All GPUs supported by the amdgpu kernel driver" }, + { -1, NULL } +}; + /* Return the string name for supported chipset 'n'; NULL otherwise. */ static void AMDGPUIdentify(int flags) { - xf86PrintChipsets(AMDGPU_NAME, - "Driver for AMD Radeon chipsets", AMDGPUUniqueChipsets); + xf86PrintChipsets(AMDGPU_NAME, "Driver for AMD Radeon", AMDGPUAny); } static char *amdgpu_bus_id(ScrnInfoPtr pScrn, struct pci_device *dev) -- cgit v1.2.3