aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
diff options
context:
space:
mode:
authoryipechai <[email protected]>2022-02-15 06:38:13 +0000
committerAlex Deucher <[email protected]>2022-02-17 20:59:05 +0000
commit418abce203fc2e936bf8c7632a9a429e861f6283 (patch)
tree2af7cd6a0eca02b9ab927fcbad7a98c455459f2e /drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
parentdrm/amdgpu: define amdgpu_ras_late_init to call all ras blocks' .ras_late_init (diff)
downloadkernel-418abce203fc2e936bf8c7632a9a429e861f6283.tar.gz
kernel-418abce203fc2e936bf8c7632a9a429e861f6283.zip
drm/amdgpu: Remove redundant .ras_late_init initialization in some ras blocks
1. Define amdgpu_ras_block_late_init_default in amdgpu_ras.c as .ras_late_init common function, which is called when .ras_late_init of ras block isn't initialized. 2. Remove the code of using amdgpu_ras_block_late_init to initialize .ras_late_init in ras blocks. Signed-off-by: yipechai <[email protected]> Reviewed-by: Tao Zhou <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 73e8d6f70541..d60123e9d045 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -2457,6 +2457,12 @@ interrupt:
return r;
}
+int amdgpu_ras_block_late_init_default(struct amdgpu_device *adev,
+ struct ras_common_if *ras_block)
+{
+ return amdgpu_ras_block_late_init(adev, ras_block);
+}
+
/* helper function to remove ras fs node and interrupt handler */
void amdgpu_ras_block_late_fini(struct amdgpu_device *adev,
struct ras_common_if *ras_block)
@@ -2533,6 +2539,7 @@ int amdgpu_ras_late_init(struct amdgpu_device *adev)
dev_warn(adev->dev, "Warning: abnormal ras list node.\n");
continue;
}
+
obj = node->ras_obj;
if (obj->ras_late_init) {
r = obj->ras_late_init(adev, &obj->ras_comm);
@@ -2541,7 +2548,8 @@ int amdgpu_ras_late_init(struct amdgpu_device *adev)
obj->ras_comm.name, r);
return r;
}
- }
+ } else
+ amdgpu_ras_block_late_init_default(adev, &obj->ras_comm);
}
return 0;