tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm/amdgpu: add psp 13_0_12 version support

Add support for new psp 13_0_12 version

Signed-off-by: Le Ma <le.ma@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Le Ma and committed by
Alex Deucher 2d2f1622 b6e6871a

+8
+1
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
··· 2015 2015 case IP_VERSION(13, 0, 8): 2016 2016 case IP_VERSION(13, 0, 10): 2017 2017 case IP_VERSION(13, 0, 11): 2018 + case IP_VERSION(13, 0, 12): 2018 2019 case IP_VERSION(13, 0, 14): 2019 2020 case IP_VERSION(14, 0, 0): 2020 2021 case IP_VERSION(14, 0, 1):
+3
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
··· 208 208 psp->boot_time_tmr = false; 209 209 fallthrough; 210 210 case IP_VERSION(13, 0, 6): 211 + case IP_VERSION(13, 0, 12): 211 212 case IP_VERSION(13, 0, 14): 212 213 psp_v13_0_set_psp_funcs(psp); 213 214 psp->autoload_supported = false; ··· 360 359 int i; 361 360 362 361 if (amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 6) || 362 + amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 12) || 363 363 amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 14)) 364 364 return false; 365 365 ··· 872 870 case IP_VERSION(13, 0, 2): 873 871 case IP_VERSION(13, 0, 6): 874 872 case IP_VERSION(13, 0, 10): 873 + case IP_VERSION(13, 0, 12): 875 874 case IP_VERSION(13, 0, 14): 876 875 return true; 877 876 default:
+3
drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
··· 122 122 case IP_VERSION(13, 0, 6): 123 123 case IP_VERSION(13, 0, 7): 124 124 case IP_VERSION(13, 0, 10): 125 + case IP_VERSION(13, 0, 12): 125 126 case IP_VERSION(13, 0, 14): 126 127 err = psp_init_sos_microcode(psp, ucode_prefix); 127 128 if (err) ··· 178 177 179 178 retry_cnt = 180 179 ((amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 6) || 180 + amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 12) || 181 181 amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 14))) ? 182 182 PSP_VMBX_POLLING_LIMIT : 183 183 10; ··· 205 203 int ret; 206 204 207 205 if (amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 6) || 206 + amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 12) || 208 207 amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 14)) { 209 208 ret = psp_v13_0_wait_for_vmbx_ready(psp); 210 209 if (ret)
+1
drivers/gpu/drm/amd/amdgpu/soc15.c
··· 1454 1454 1455 1455 if ((amdgpu_ip_version(adev, MP0_HWIP, 0) != IP_VERSION(13, 0, 2)) && 1456 1456 (amdgpu_ip_version(adev, MP0_HWIP, 0) != IP_VERSION(13, 0, 6)) && 1457 + (amdgpu_ip_version(adev, MP0_HWIP, 0) != IP_VERSION(13, 0, 12)) && 1457 1458 (amdgpu_ip_version(adev, MP0_HWIP, 0) != IP_VERSION(13, 0, 14))) { 1458 1459 /* AMD_CG_SUPPORT_DRM_MGCG */ 1459 1460 data = RREG32(SOC15_REG_OFFSET(MP0, 0, mmMP0_MISC_CGTT_CTRL0));