[PATCH] drm/amdgpu: skip call ras_late_init if ras block is not supported

Zhou1, Tao Tao.Zhou1 at amd.com
Mon Jan 22 07:16:24 UTC 2024


[AMD Official Use Only - General]

Reviewed-by: Tao Zhou <tao.zhou1 at amd.com>

> -----Original Message-----
> From: Wang, Yang(Kevin) <KevinYang.Wang at amd.com>
> Sent: Monday, January 22, 2024 1:29 PM
> To: amd-gfx at lists.freedesktop.org
> Cc: Zhang, Hawking <Hawking.Zhang at amd.com>; Zhou1, Tao
> <Tao.Zhou1 at amd.com>; Wang, Yang(Kevin) <KevinYang.Wang at amd.com>
> Subject: [PATCH] drm/amdgpu: skip call ras_late_init if ras block is not supported
>
> skip call ras_late_init callback if ras block is not supported.
>
> Signed-off-by: Yang Wang <kevinyang.wang at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> index f4fcb008d7ba..61ba7cd8345d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> @@ -3346,12 +3346,15 @@ int amdgpu_ras_late_init(struct amdgpu_device
> *adev)
>               amdgpu_ras_set_mca_debug_mode(adev, false);
>
>       list_for_each_entry_safe(node, tmp, &adev->ras_list, node) {
> -             if (!node->ras_obj) {
> +             obj = node->ras_obj;
> +             if (!obj) {
>                       dev_warn(adev->dev, "Warning: abnormal ras list
> node.\n");
>                       continue;
>               }
>
> -             obj = node->ras_obj;
> +             if (!amdgpu_ras_is_supported(adev, obj->ras_comm.block))
> +                     continue;
> +
>               if (obj->ras_late_init) {
>                       r = obj->ras_late_init(adev, &obj->ras_comm);
>                       if (r) {
> --
> 2.34.1



More information about the amd-gfx mailing list