[AMD Official Use Only - AMD Internal Distribution Only]
> -----Original Message-----
> From: Chai, Thomas <[email protected]>
> Sent: Monday, November 3, 2025 5:05 PM
> To: [email protected]
> Cc: Zhang, Hawking <[email protected]>; Zhou1, Tao
> <[email protected]>; Li, Candice <[email protected]>; Yang, Stanley
> <[email protected]>; Su, Joe <[email protected]>; Chai, Thomas
> <[email protected]>
> Subject: [PATCH 2/2] drm/amd/ras: Add ras support for umc v12_5_0
>
> Add ras support for umc v12_5_0.
>
> Signed-off-by: YiPeng Chai <[email protected]>
> ---
> drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c | 3 ++-
> drivers/gpu/drm/amd/ras/rascore/ras_umc.c | 1 +
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> 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 b06aab25d4cc..40b458a922d5 100644
> --- 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))
[Tao] can we use " init_config.umc_ip_version >= IP_VERSION(12, 0, 0) " here?
> 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 4067359bb299..4dae64c424a2 100644
> --- 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,
> --
> 2.34.1
