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: Enable RAS for psp v13_0_12

Enable RAS Cap check and initialize RAS funcs
for psp v13_0_12

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Hawking Zhang and committed by
Alex Deucher 9a826c4a 98230feb

+6
+5
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
··· 2015 2015 2016 2016 switch (amdgpu_ip_version(adev, MP0_HWIP, 0)) { 2017 2017 case IP_VERSION(13, 0, 6): 2018 + case IP_VERSION(13, 0, 12): 2018 2019 case IP_VERSION(13, 0, 14): 2019 2020 ret = true; 2020 2021 break; ··· 3569 3568 switch (amdgpu_ip_version(adev, MP0_HWIP, 0)) { 3570 3569 case IP_VERSION(13, 0, 2): 3571 3570 case IP_VERSION(13, 0, 6): 3571 + case IP_VERSION(13, 0, 12): 3572 3572 case IP_VERSION(13, 0, 14): 3573 3573 return true; 3574 3574 default: ··· 3582 3580 case IP_VERSION(13, 0, 0): 3583 3581 case IP_VERSION(13, 0, 6): 3584 3582 case IP_VERSION(13, 0, 10): 3583 + case IP_VERSION(13, 0, 12): 3585 3584 case IP_VERSION(13, 0, 14): 3586 3585 return true; 3587 3586 default: ··· 3834 3831 switch (amdgpu_ip_version(adev, MP0_HWIP, 0)) { 3835 3832 case IP_VERSION(13, 0, 2): 3836 3833 case IP_VERSION(13, 0, 6): 3834 + case IP_VERSION(13, 0, 12): 3837 3835 case IP_VERSION(13, 0, 14): 3838 3836 con->reserved_pages_in_bytes = AMDGPU_RAS_RESERVED_VRAM_SIZE; 3839 3837 break; ··· 3911 3907 adev->nbio.ras = &nbio_v4_3_ras; 3912 3908 break; 3913 3909 case IP_VERSION(7, 9, 0): 3910 + case IP_VERSION(7, 9, 1): 3914 3911 if (!adev->gmc.is_app_apu) 3915 3912 adev->nbio.ras = &nbio_v7_9_ras; 3916 3913 break;
+1
drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
··· 808 808 return false; 809 809 810 810 if ((amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 6) || 811 + amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 12) || 811 812 amdgpu_ip_version(adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 14)) && 812 813 (!(adev->flags & AMD_IS_APU))) { 813 814 reg_data = RREG32_SOC15(MP0, 0, regMP0_SMN_C2PMSG_127);