Commit 27c5f295 authored by Tao Zhou's avatar Tao Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: reorganize RAS injection flow 



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

Signed-off-by: default avatarTao Zhou <tao.zhou1@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarStanley.Yang <Stanley.Yang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2c22ed0b

drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c

+6 −7
Original line number Diff line number Diff line
@@ -1123,15 +1123,14 @@ int amdgpu_ras_error_inject(struct amdgpu_device *adev, 
							  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);

	} else {

		/* If defined special ras_error_inject(e.g: xgmi), implement special ras_error_inject */

		if (block_obj->hw_ops->ras_error_inject)

		else /* Special ras_error_inject is defined (e.g: xgmi) */

			ret = block_obj->hw_ops->ras_error_inject(adev, &block_info,

						info->instance_mask);

		else  /*If not defined .ras_error_inject, use default ras_error_inject*/

	} else {

		/* default path */

		ret = psp_ras_trigger_error(&adev->psp, &block_info, info->instance_mask);

	}