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

drm/amdgpu: move mmhub ras fini to mmhub block

it's more suitable to put mmhub ras fini in mmhub 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
19604120 181c93e5

+16 -12
+1 -11
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
··· 310 310 void amdgpu_gmc_ras_fini(struct amdgpu_device *adev) 311 311 { 312 312 amdgpu_umc_ras_fini(adev); 313 - 314 - if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__MMHUB) && 315 - adev->mmhub.ras_if) { 316 - struct ras_common_if *ras_if = adev->mmhub.ras_if; 317 - struct ras_ih_if ih_info = { 318 - .cb = NULL, 319 - }; 320 - 321 - amdgpu_ras_late_fini(adev, ras_if, &ih_info); 322 - kfree(ras_if); 323 - } 313 + amdgpu_mmhub_ras_fini(adev); 324 314 325 315 if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__XGMI_WAFL) && 326 316 adev->gmc.xgmi.ras_if) {
+14
drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c
··· 54 54 55 55 return r; 56 56 } 57 + 58 + void amdgpu_mmhub_ras_fini(struct amdgpu_device *adev) 59 + { 60 + if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__MMHUB) && 61 + adev->mmhub.ras_if) { 62 + struct ras_common_if *ras_if = adev->mmhub.ras_if; 63 + struct ras_ih_if ih_info = { 64 + .cb = NULL, 65 + }; 66 + 67 + amdgpu_ras_late_fini(adev, ras_if, &ih_info); 68 + kfree(ras_if); 69 + } 70 + }
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h
··· 34 34 }; 35 35 36 36 int amdgpu_mmhub_ras_late_init(struct amdgpu_device *adev); 37 - 37 + void amdgpu_mmhub_ras_fini(struct amdgpu_device *adev); 38 38 #endif 39 39