Commit a5c75947 authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: Remove gfx v11_0_3 ras_late_init call 



amdgpu_ras_late_init will invoke ras_late_init call
per IP block

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarTao Zhou <tao.zhou1@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 21539a6d

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

+0 −26
Original line number Diff line number Diff line
@@ -4650,26 +4650,6 @@ static int gfx_v11_0_early_init(void *handle) 
	return gfx_v11_0_init_microcode(adev);

}



static int gfx_v11_0_ras_late_init(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	struct ras_common_if *gfx_common_if;

	int ret;



	gfx_common_if = kzalloc(sizeof(struct ras_common_if), GFP_KERNEL);

	if (!gfx_common_if)

		return -ENOMEM;



	gfx_common_if->block = AMDGPU_RAS_BLOCK__GFX;



	ret = amdgpu_ras_feature_enable(adev, gfx_common_if, true);

	if (ret)

		dev_warn(adev->dev, "Failed to enable gfx11 ras feature\n");



	kfree(gfx_common_if);

	return 0;

}



static int gfx_v11_0_late_init(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
@@ -4683,12 +4663,6 @@ static int gfx_v11_0_late_init(void *handle) 
	if (r)

		return r;



	if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(11, 0, 3)) {

		r = gfx_v11_0_ras_late_init(handle);

		if (r)

			return r;

	}



	return 0;

}