Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: move umc ras fini to umc block

it's more suitable to put umc ras fini in umc block

Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Guchun Chen <guchun.chen@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Tao Zhou and committed by
Alex Deucher
181c93e5 f2575941

+17 -11
+1 -11
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
··· 309 309 310 310 void amdgpu_gmc_ras_fini(struct amdgpu_device *adev) 311 311 { 312 - if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__UMC) && 313 - adev->umc.ras_if) { 314 - struct ras_common_if *ras_if = adev->umc.ras_if; 315 - struct ras_ih_if ih_info = { 316 - .head = *ras_if, 317 - .cb = amdgpu_umc_process_ras_data_cb, 318 - }; 319 - 320 - amdgpu_ras_late_fini(adev, ras_if, &ih_info); 321 - kfree(ras_if); 322 - } 312 + amdgpu_umc_ras_fini(adev); 323 313 324 314 if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__MMHUB) && 325 315 adev->mmhub.ras_if) {
+15
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
··· 74 74 return r; 75 75 } 76 76 77 + void amdgpu_umc_ras_fini(struct amdgpu_device *adev) 78 + { 79 + if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__UMC) && 80 + adev->umc.ras_if) { 81 + struct ras_common_if *ras_if = adev->umc.ras_if; 82 + struct ras_ih_if ih_info = { 83 + .head = *ras_if, 84 + .cb = amdgpu_umc_process_ras_data_cb, 85 + }; 86 + 87 + amdgpu_ras_late_fini(adev, ras_if, &ih_info); 88 + kfree(ras_if); 89 + } 90 + } 91 + 77 92 int amdgpu_umc_process_ras_data_cb(struct amdgpu_device *adev, 78 93 void *ras_error_status, 79 94 struct amdgpu_iv_entry *entry)
+1
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h
··· 83 83 }; 84 84 85 85 int amdgpu_umc_ras_late_init(struct amdgpu_device *adev); 86 + void amdgpu_umc_ras_fini(struct amdgpu_device *adev); 86 87 int amdgpu_umc_process_ras_data_cb(struct amdgpu_device *adev, 87 88 void *ras_error_status, 88 89 struct amdgpu_iv_entry *entry);