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

drm/amdgpu: move umc ras init to umc block 



move umc ras init from ras module to umc block, generic ras module
should pay less attention to specific ras 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 86edcc7d

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

+0 −4
Original line number Diff line number Diff line
@@ -1655,10 +1655,6 @@ int amdgpu_ras_init(struct amdgpu_device *adev) 
	if (amdgpu_ras_fs_init(adev))

		goto fs_out;



	/* ras init for each ras block */

	if (adev->umc.funcs->ras_init)

		adev->umc.funcs->ras_init(adev);



	DRM_INFO("RAS INFO: ras initialized successfully, "

			"hardware ability[%x] ras_mask[%x]\n",

			con->hw_supported, con->supported);

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

+4 −0
Original line number Diff line number Diff line
@@ -62,6 +62,10 @@ int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, void *ras_ih_info) 
		goto free;

	}



	/* ras init of specific umc version */

	if (adev->umc.funcs && adev->umc.funcs->ras_init)

		adev->umc.funcs->ras_init(adev);



	return 0;



late_fini:

CRA Git | Maintained and supported by SUSTech CRA and CCSE