Commit 20c43547 authored by yipechai's avatar yipechai Committed by Alex Deucher
Browse files

drm/amdgpu: Remove redundant calls of ras_late_init in mca ras block 



Remove redundant calls of ras_late_init in mca ras block.

Signed-off-by: default avataryipechai <YiPeng.Chai@amd.com>
Reviewed-by: default avatarTao Zhou <tao.zhou1@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 068001b7

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

+3 −3
Original line number Diff line number Diff line
@@ -476,19 +476,19 @@ int amdgpu_gmc_ras_late_init(struct amdgpu_device *adev) 
	}



	if (adev->mca.mp0.ras && adev->mca.mp0.ras->ras_block.ras_late_init) {

		r = adev->mca.mp0.ras->ras_block.ras_late_init(adev, NULL);

		r = adev->mca.mp0.ras->ras_block.ras_late_init(adev, adev->mca.mp0.ras_if);

		if (r)

			return r;

	}



	if (adev->mca.mp1.ras && adev->mca.mp1.ras->ras_block.ras_late_init) {

		r = adev->mca.mp1.ras->ras_block.ras_late_init(adev, NULL);

		r = adev->mca.mp1.ras->ras_block.ras_late_init(adev, adev->mca.mp1.ras_if);

		if (r)

			return r;

	}



	if (adev->mca.mpio.ras && adev->mca.mpio.ras->ras_block.ras_late_init) {

		r = adev->mca.mpio.ras->ras_block.ras_late_init(adev, NULL);

		r = adev->mca.mpio.ras->ras_block.ras_late_init(adev, adev->mca.mpio.ras_if);

		if (r)

			return r;

	}

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

+0 −6
Original line number Diff line number Diff line
@@ -71,12 +71,6 @@ void amdgpu_mca_query_ras_error_count(struct amdgpu_device *adev, 
	amdgpu_mca_reset_error_count(adev, mc_status_addr);

}



int amdgpu_mca_ras_late_init(struct amdgpu_device *adev,

			     struct amdgpu_mca_ras *mca_dev)

{

	return amdgpu_ras_block_late_init(adev, mca_dev->ras_if);

}



void amdgpu_mca_ras_fini(struct amdgpu_device *adev,

			 struct amdgpu_mca_ras *mca_dev)

{

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

+0 −3
Original line number Diff line number Diff line
@@ -56,9 +56,6 @@ void amdgpu_mca_query_ras_error_count(struct amdgpu_device *adev, 
				      uint64_t mc_status_addr,

				      void *ras_error_status);



int amdgpu_mca_ras_late_init(struct amdgpu_device *adev,

			     struct amdgpu_mca_ras *mca_dev);



void amdgpu_mca_ras_fini(struct amdgpu_device *adev,

			 struct amdgpu_mca_ras *mca_dev);

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

+3 −18
Original line number Diff line number Diff line
@@ -37,11 +37,6 @@ static void mca_v3_0_mp0_query_ras_error_count(struct amdgpu_device *adev, 
				         ras_error_status);

}



static int mca_v3_0_mp0_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block)

{

	return amdgpu_mca_ras_late_init(adev, &adev->mca.mp0);

}



static void mca_v3_0_mp0_ras_fini(struct amdgpu_device *adev)

{

	amdgpu_mca_ras_fini(adev, &adev->mca.mp0);
@@ -76,7 +71,7 @@ struct amdgpu_mca_ras_block mca_v3_0_mp0_ras = { 
		},

		.hw_ops = &mca_v3_0_mp0_hw_ops,

		.ras_block_match = mca_v3_0_ras_block_match,

		.ras_late_init = mca_v3_0_mp0_ras_late_init,

		.ras_late_init = amdgpu_ras_block_late_init,

		.ras_fini = mca_v3_0_mp0_ras_fini,

	},

};
@@ -89,11 +84,6 @@ static void mca_v3_0_mp1_query_ras_error_count(struct amdgpu_device *adev, 
				         ras_error_status);

}



static int mca_v3_0_mp1_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block)

{

	return amdgpu_mca_ras_late_init(adev, &adev->mca.mp1);

}



static void mca_v3_0_mp1_ras_fini(struct amdgpu_device *adev)

{

	amdgpu_mca_ras_fini(adev, &adev->mca.mp1);
@@ -114,7 +104,7 @@ struct amdgpu_mca_ras_block mca_v3_0_mp1_ras = { 
		},

		.hw_ops = &mca_v3_0_mp1_hw_ops,

		.ras_block_match = mca_v3_0_ras_block_match,

		.ras_late_init = mca_v3_0_mp1_ras_late_init,

		.ras_late_init = amdgpu_ras_block_late_init,

		.ras_fini = mca_v3_0_mp1_ras_fini,

	},

};
@@ -127,11 +117,6 @@ static void mca_v3_0_mpio_query_ras_error_count(struct amdgpu_device *adev, 
				         ras_error_status);

}



static int mca_v3_0_mpio_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block)

{

	return amdgpu_mca_ras_late_init(adev, &adev->mca.mpio);

}



static void mca_v3_0_mpio_ras_fini(struct amdgpu_device *adev)

{

	amdgpu_mca_ras_fini(adev, &adev->mca.mpio);
@@ -152,7 +137,7 @@ struct amdgpu_mca_ras_block mca_v3_0_mpio_ras = { 
		},

		.hw_ops = &mca_v3_0_mpio_hw_ops,

		.ras_block_match = mca_v3_0_ras_block_match,

		.ras_late_init = mca_v3_0_mpio_ras_late_init,

		.ras_late_init = amdgpu_ras_block_late_init,

		.ras_fini = mca_v3_0_mpio_ras_fini,

	},

};