Commit 19604120 authored by Tao Zhou's avatar Tao Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: move mmhub ras fini to mmhub block 



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

Signed-off-by: default avatarTao Zhou <tao.zhou1@amd.com>
Reviewed-by: default avatarGuchun Chen <guchun.chen@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 181c93e5

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

+1 −11
Original line number Diff line number Diff line
@@ -310,17 +310,7 @@ bool amdgpu_gmc_filter_faults(struct amdgpu_device *adev, uint64_t addr, 
void amdgpu_gmc_ras_fini(struct amdgpu_device *adev)

{

	amdgpu_umc_ras_fini(adev);



	if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__MMHUB) &&

			adev->mmhub.ras_if) {

		struct ras_common_if *ras_if = adev->mmhub.ras_if;

		struct ras_ih_if ih_info = {

			.cb = NULL,

		};



		amdgpu_ras_late_fini(adev, ras_if, &ih_info);

		kfree(ras_if);

	}

	amdgpu_mmhub_ras_fini(adev);



	if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__XGMI_WAFL) &&

			adev->gmc.xgmi.ras_if) {

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

+14 −0
Original line number Diff line number Diff line
@@ -54,3 +54,17 @@ int amdgpu_mmhub_ras_late_init(struct amdgpu_device *adev) 


	return r;

}



void amdgpu_mmhub_ras_fini(struct amdgpu_device *adev)

{

	if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__MMHUB) &&

			adev->mmhub.ras_if) {

		struct ras_common_if *ras_if = adev->mmhub.ras_if;

		struct ras_ih_if ih_info = {

			.cb = NULL,

		};



		amdgpu_ras_late_fini(adev, ras_if, &ih_info);

		kfree(ras_if);

	}

}

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

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,6 @@ struct amdgpu_mmhub { 
};



int amdgpu_mmhub_ras_late_init(struct amdgpu_device *adev);



void amdgpu_mmhub_ras_fini(struct amdgpu_device *adev);

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE