drm/amd/ras: Add ras support for umc v12_5_0

Add ras support for umc v12_5_0.

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

diff --git a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c
index e31ffebd32d91ac1180888c6a042832954de402f..adb01bdee00375aed5ea8eb227ffc3c47c8f43eb 100644 (file)
--- a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c
+++ b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c
@@ -259,7 +259,8 @@ static struct ras_core_context *amdgpu_ras_mgr_create_ras_core(struct amdgpu_dev
        init_config.nbio_ip_version = amdgpu_ip_version(adev, NBIO_HWIP, 0);
        init_config.psp_ip_version = amdgpu_ip_version(adev, MP1_HWIP, 0);
 
-       if (init_config.umc_ip_version == IP_VERSION(12, 0, 0))
+       if (init_config.umc_ip_version == IP_VERSION(12, 0, 0) ||
+           init_config.umc_ip_version == IP_VERSION(12, 5, 0))
                init_config.aca_ip_version = IP_VERSION(1, 0, 0);
 
        init_config.sys_fn = &amdgpu_ras_sys_fn;

diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_umc.c b/drivers/gpu/drm/amd/ras/rascore/ras_umc.c
index 4067359bb299371fb634681221d42a981d510739..4dae64c424a2475eaaecc6d66e7722594c22d842 100644 (file)
--- a/drivers/gpu/drm/amd/ras/rascore/ras_umc.c
+++ b/drivers/gpu/drm/amd/ras/rascore/ras_umc.c
@@ -71,6 +71,7 @@ static const struct ras_umc_ip_func *ras_umc_get_ip_func(
 {
        switch (ip_version) {
        case IP_VERSION(12, 0, 0):
+       case IP_VERSION(12, 5, 0):
                return &ras_umc_func_v12_0;
        default:
                RAS_DEV_ERR(ras_core->dev,