diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/amdgpu_kms.c | 12 | ||||
| -rw-r--r-- | src/amdgpu_probe.c | 11 |
3 files changed, 11 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 726b970..6d0279e 100644 --- a/configure.ac +++ b/configure.ac @@ -70,7 +70,7 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for libraries. PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.58]) -PKG_CHECK_MODULES(LIBDRM_AMDGPU, [libdrm_amdgpu]) +PKG_CHECK_MODULES(LIBDRM_AMDGPU, [libdrm_amdgpu >= 2.4.72]) PKG_CHECK_MODULES(GBM, [gbm]) # Obtain compiler/linker options for the driver dependencies diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c index 225b17b..319b572 100644 --- a/src/amdgpu_kms.c +++ b/src/amdgpu_kms.c @@ -58,7 +58,6 @@ static DevScreenPrivateKeyRec amdgpu_client_private_key; -extern SymTabRec AMDGPUChipsets[]; static Bool amdgpu_setup_kernel_mem(ScreenPtr pScreen); const OptionInfoRec AMDGPUOptions_KMS[] = { @@ -1160,15 +1159,12 @@ static Bool AMDGPUPreInitChipType_KMS(ScrnInfoPtr pScrn, struct amdgpu_gpu_info *gpu_info) { AMDGPUInfoPtr info = AMDGPUPTR(pScrn); + AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(pScrn); info->Chipset = info->PciInfo->device_id; - pScrn->chipset = - (char *)xf86TokenToString(AMDGPUChipsets, info->Chipset); - if (!pScrn->chipset) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "ChipID 0x%04x is not recognized\n", info->Chipset); - return FALSE; - } + pScrn->chipset = amdgpu_get_marketing_name(pAMDGPUEnt->pDev); + if (!pScrn->chipset) + pScrn->chipset = "Unknown AMD Radeon GPU"; if (info->Chipset < 0) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 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 <xf86platformBus.h> #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) |