diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2016-10-26 18:36:18 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel.daenzer@amd.com> | 2016-11-21 17:55:57 +0900 |
| commit | d69fd22b6d13052d667929a0e3db61829ce1396e (patch) | |
| tree | cbfce8a17d01c9692b2d642a515b689be53e45fb /src/amdgpu_kms.c | |
| parent | 8a5ff54af32a75ae56d3369a828a50ae28dd1acd (diff) | |
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 <alexander.deucher@amd.com> (v1)
Diffstat (limited to 'src/amdgpu_kms.c')
| -rw-r--r-- | src/amdgpu_kms.c | 12 |
1 files changed, 4 insertions, 8 deletions
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, |