Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/amdgpu: Use discovery table's subrevision
Use subrevision of IP version in discovery table to identify SOC
revision id for NBIO v7.9 SOCs. Only newer bootloaders update
subrevision field.
Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Le Ma <le.ma@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
authored by
Lijo Lazar
and committed by
Alex Deucher
dd2687f5
ae8cffe3
+8
-1
+8
-1
drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c
+8
-1
drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c
···
56
56
{
57
57
u32 tmp;
58
58
59
+
tmp = IP_VERSION_SUBREV(amdgpu_ip_version_full(adev, NBIO_HWIP, 0));
60
+
/* If it is VF or subrevision holds a non-zero value, that should be used */
61
+
if (tmp || amdgpu_sriov_vf(adev))
62
+
return tmp;
63
+
64
+
/* If discovery subrev is not updated, use register version */
59
65
tmp = RREG32_SOC15(NBIO, 0, regRCC_STRAP0_RCC_DEV0_EPF0_STRAP0);
60
-
tmp = REG_GET_FIELD(tmp, RCC_STRAP0_RCC_DEV0_EPF0_STRAP0, STRAP_ATI_REV_ID_DEV0_F0);
66
+
tmp = REG_GET_FIELD(tmp, RCC_STRAP0_RCC_DEV0_EPF0_STRAP0,
67
+
STRAP_ATI_REV_ID_DEV0_F0);
61
68
62
69
return tmp;
63
70
}