Commit 73582be1 authored by Tao Zhou's avatar Tao Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: bypass RAS error reset in some conditions 



PMFW is responsible for RAS error reset in some conditions, driver can
skip the operation.

v2: add check for ras->in_recovery, it's set earlier than
amdgpu_in_reset.

v3: fix error in gpu reset check.

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

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

+9 −1
Original line number Diff line number Diff line
@@ -1220,6 +1220,8 @@ int amdgpu_ras_reset_error_count(struct amdgpu_device *adev, 
		enum amdgpu_ras_block block)

{

	struct amdgpu_ras_block_object *block_obj = amdgpu_ras_get_ras_block(adev, block, 0);

	struct amdgpu_ras *ras = amdgpu_ras_get_context(adev);

	const struct amdgpu_mca_smu_funcs *mca_funcs = adev->mca.mca_funcs;



	if (!block_obj || !block_obj->hw_ops) {

		dev_dbg_once(adev->dev, "%s doesn't config RAS function\n",
@@ -1227,7 +1229,13 @@ int amdgpu_ras_reset_error_count(struct amdgpu_device *adev, 
		return -EOPNOTSUPP;

	}



	if (!amdgpu_ras_is_supported(adev, block))

	/* skip ras error reset in gpu reset */

	if ((amdgpu_in_reset(adev) || atomic_read(&ras->in_recovery)) &&

	    mca_funcs && mca_funcs->mca_set_debug_mode)

		return -EOPNOTSUPP;



	if (!amdgpu_ras_is_supported(adev, block) ||

	    !amdgpu_ras_get_mca_debug_mode(adev))

		return -EOPNOTSUPP;



	if (block_obj->hw_ops->reset_ras_error_count)