]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm/amdgpu: Fix false positive error log
authorStanley.Yang <Stanley.Yang@amd.com>
Fri, 15 Sep 2023 10:44:17 +0000 (18:44 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 20 Sep 2023 20:24:09 +0000 (16:24 -0400)
It should first check block ras obj whether be set, it should
return 0 directly if block ras obj or hw_ops is not set.
If block doesn't support RAS just return 0 is fine.

Changed from V1:
return 0 directly if block ras obj or hw ops is not set

Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c

index 62dca5d80fb6e0d7542127ffdbf45fce9558cfe3..9c8203e87859e16c9483a2d0d7df435a9b750f4b 100644 (file)
@@ -1102,15 +1102,15 @@ int amdgpu_ras_reset_error_status(struct amdgpu_device *adev,
 {
        struct amdgpu_ras_block_object *block_obj = amdgpu_ras_get_ras_block(adev, block, 0);
 
-       if (!amdgpu_ras_is_supported(adev, block))
-               return -EINVAL;
-
-       if (!block_obj || !block_obj->hw_ops)   {
+       if (!block_obj || !block_obj->hw_ops) {
                dev_dbg_once(adev->dev, "%s doesn't config RAS function\n",
                             ras_block_str(block));
-               return -EINVAL;
+               return 0;
        }
 
+       if (!amdgpu_ras_is_supported(adev, block))
+               return 0;
+
        if (block_obj->hw_ops->reset_ras_error_count)
                block_obj->hw_ops->reset_ras_error_count(adev);