mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-07 17:19:02 +00:00
Code Issues Releases Wiki Activity

drm/amdgpu: reorganize RAS injection flow

Browse source 
So GFX RAS injection could use default function if it doesn't define its
own injection interface.

Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Stanley.Yang <Stanley.Yang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Tao Zhou 2023-03-13 16:24:11 +08:00 committed by Alex Deucher
parent 2c22ed0bdb
commit 27c5f29526
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
View file

@ -1123,16 +1123,15 @@ int amdgpu_ras_error_inject(struct amdgpu_device *adev,
block_info.address); block_info.address);
} }
if (info->head.block == AMDGPU_RAS_BLOCK__GFX) { if (block_obj->hw_ops->ras_error_inject) {
if (block_obj->hw_ops->ras_error_inject) if (info->head.block == AMDGPU_RAS_BLOCK__GFX)
ret = block_obj->hw_ops->ras_error_inject(adev, info, info->instance_mask); ret = block_obj->hw_ops->ras_error_inject(adev, info, info->instance_mask);
} else { else /* Special ras_error_inject is defined (e.g: xgmi) */
/* If defined special ras_error_inject(e.g: xgmi), implement special ras_error_inject */
if (block_obj->hw_ops->ras_error_inject)
ret = block_obj->hw_ops->ras_error_inject(adev, &block_info, ret = block_obj->hw_ops->ras_error_inject(adev, &block_info,
info->instance_mask); info->instance_mask);
else /*If not defined .ras_error_inject, use default ras_error_inject*/ } else {
ret = psp_ras_trigger_error(&adev->psp, &block_info, info->instance_mask); /* default path */
ret = psp_ras_trigger_error(&adev->psp, &block_info, info->instance_mask);
} }
if (ret) if (ret)