Commit 472c5fb2 authored by Tao Zhou's avatar Tao Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: define ras_reset_error_count function 



Make the code architecture more simple.

v2: reuse ras_reset_error_count in ras_reset_error_status.

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 f9caf6cd

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

+15 −4
Original line number Diff line number Diff line
@@ -1170,7 +1170,7 @@ int amdgpu_ras_query_error_status(struct amdgpu_device *adev, 
	return ret;

}



int amdgpu_ras_reset_error_status(struct amdgpu_device *adev,

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);
@@ -1178,15 +1178,26 @@ int amdgpu_ras_reset_error_status(struct amdgpu_device *adev, 
	if (!block_obj || !block_obj->hw_ops) {

		dev_dbg_once(adev->dev, "%s doesn't config RAS function\n",

				ras_block_str(block));

		return 0;

		return -EOPNOTSUPP;

	}



	if (!amdgpu_ras_is_supported(adev, block))

		return 0;

		return -EOPNOTSUPP;



	if (block_obj->hw_ops->reset_ras_error_count)

		block_obj->hw_ops->reset_ras_error_count(adev);



	return 0;

}



int amdgpu_ras_reset_error_status(struct amdgpu_device *adev,

		enum amdgpu_ras_block block)

{

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



	if (amdgpu_ras_reset_error_count(adev, block) == -EOPNOTSUPP)

		return 0;



	if ((block == AMDGPU_RAS_BLOCK__GFX) ||

	    (block == AMDGPU_RAS_BLOCK__MMHUB)) {

		if (block_obj->hw_ops->reset_ras_error_status)

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

+2 −0
Original line number Diff line number Diff line
@@ -714,6 +714,8 @@ void amdgpu_ras_debugfs_create_all(struct amdgpu_device *adev); 
int amdgpu_ras_query_error_status(struct amdgpu_device *adev,

		struct ras_query_if *info);



int amdgpu_ras_reset_error_count(struct amdgpu_device *adev,

		enum amdgpu_ras_block block);

int amdgpu_ras_reset_error_status(struct amdgpu_device *adev,

		enum amdgpu_ras_block block);