Skip to content

Commit 472c5fb

Browse files
Tao Zhoualexdeucher
authored andcommitted
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: Tao Zhou <tao.zhou1@amd.com> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent f9caf6c commit 472c5fb

2 files changed

Lines changed: 17 additions & 4 deletions

File tree

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

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,23 +1170,34 @@ int amdgpu_ras_query_error_status(struct amdgpu_device *adev,
11701170
return ret;
11711171
}
11721172

1173-
int amdgpu_ras_reset_error_status(struct amdgpu_device *adev,
1173+
int amdgpu_ras_reset_error_count(struct amdgpu_device *adev,
11741174
enum amdgpu_ras_block block)
11751175
{
11761176
struct amdgpu_ras_block_object *block_obj = amdgpu_ras_get_ras_block(adev, block, 0);
11771177

11781178
if (!block_obj || !block_obj->hw_ops) {
11791179
dev_dbg_once(adev->dev, "%s doesn't config RAS function\n",
1180-
ras_block_str(block));
1181-
return 0;
1180+
ras_block_str(block));
1181+
return -EOPNOTSUPP;
11821182
}
11831183

11841184
if (!amdgpu_ras_is_supported(adev, block))
1185-
return 0;
1185+
return -EOPNOTSUPP;
11861186

11871187
if (block_obj->hw_ops->reset_ras_error_count)
11881188
block_obj->hw_ops->reset_ras_error_count(adev);
11891189

1190+
return 0;
1191+
}
1192+
1193+
int amdgpu_ras_reset_error_status(struct amdgpu_device *adev,
1194+
enum amdgpu_ras_block block)
1195+
{
1196+
struct amdgpu_ras_block_object *block_obj = amdgpu_ras_get_ras_block(adev, block, 0);
1197+
1198+
if (amdgpu_ras_reset_error_count(adev, block) == -EOPNOTSUPP)
1199+
return 0;
1200+
11901201
if ((block == AMDGPU_RAS_BLOCK__GFX) ||
11911202
(block == AMDGPU_RAS_BLOCK__MMHUB)) {
11921203
if (block_obj->hw_ops->reset_ras_error_status)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,8 @@ void amdgpu_ras_debugfs_create_all(struct amdgpu_device *adev);
714714
int amdgpu_ras_query_error_status(struct amdgpu_device *adev,
715715
struct ras_query_if *info);
716716

717+
int amdgpu_ras_reset_error_count(struct amdgpu_device *adev,
718+
enum amdgpu_ras_block block);
717719
int amdgpu_ras_reset_error_status(struct amdgpu_device *adev,
718720
enum amdgpu_ras_block block);
719721

0 commit comments

Comments
 (0)