aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/amd/amdgpu/vi.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index bf5bd931b8ca..30b408f1d5c0 100644
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -1386,15 +1386,12 @@ int vi_set_ip_blocks(struct amdgpu_device *adev)
1386 1386
1387static uint32_t vi_get_rev_id(struct amdgpu_device *adev) 1387static uint32_t vi_get_rev_id(struct amdgpu_device *adev)
1388{ 1388{
1389 if (adev->asic_type == CHIP_TOPAZ) 1389 if (adev->flags & AMD_IS_APU)
1390 return (RREG32(mmPCIE_EFUSE4) & PCIE_EFUSE4__STRAP_BIF_ATI_REV_ID_MASK)
1391 >> PCIE_EFUSE4__STRAP_BIF_ATI_REV_ID__SHIFT;
1392 else if (adev->flags & AMD_IS_APU)
1393 return (RREG32_SMC(ATI_REV_ID_FUSE_MACRO__ADDRESS) & ATI_REV_ID_FUSE_MACRO__MASK) 1390 return (RREG32_SMC(ATI_REV_ID_FUSE_MACRO__ADDRESS) & ATI_REV_ID_FUSE_MACRO__MASK)
1394 >> ATI_REV_ID_FUSE_MACRO__SHIFT; 1391 >> ATI_REV_ID_FUSE_MACRO__SHIFT;
1395 else 1392 else
1396 return (RREG32(mmCC_DRM_ID_STRAPS) & CC_DRM_ID_STRAPS__ATI_REV_ID_MASK) 1393 return (RREG32(mmPCIE_EFUSE4) & PCIE_EFUSE4__STRAP_BIF_ATI_REV_ID_MASK)
1397 >> CC_DRM_ID_STRAPS__ATI_REV_ID__SHIFT; 1394 >> PCIE_EFUSE4__STRAP_BIF_ATI_REV_ID__SHIFT;
1398} 1395}
1399 1396
1400static const struct amdgpu_asic_funcs vi_asic_funcs = 1397static const struct amdgpu_asic_funcs vi_asic_funcs =