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

drm/amdgpu: Optimize xxx_ras_late_init function of each ras block 



1. Move calling ras block instance members from module internal
   function to the top calling xxx_ras_late_init.
2. Module internal function calls can only use parameter variables
   of xxx_ras_late_init instead of ras block instance members.

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 20c43547

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

+3 −3
Original line number Diff line number Diff line
@@ -625,11 +625,11 @@ int amdgpu_get_gfx_off_status(struct amdgpu_device *adev, uint32_t *value) 
int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block)

{

	int r;

	r = amdgpu_ras_block_late_init(adev, adev->gfx.ras_if);

	r = amdgpu_ras_block_late_init(adev, ras_block);

	if (r)

		return r;



	if (amdgpu_ras_is_supported(adev, adev->gfx.ras_if->block)) {

	if (amdgpu_ras_is_supported(adev, ras_block->block)) {

		if (!amdgpu_persistent_edc_harvesting_supported(adev))

			amdgpu_ras_reset_error_status(adev, AMDGPU_RAS_BLOCK__GFX);
@@ -640,7 +640,7 @@ int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *r 


	return 0;

late_fini:

	amdgpu_ras_block_late_fini(adev, adev->gfx.ras_if);

	amdgpu_ras_block_late_fini(adev, ras_block);

	return r;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ int amdgpu_gmc_ras_late_init(struct amdgpu_device *adev) 
	int r;



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

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

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

		if (r)

			return r;

	}
@@ -464,7 +464,7 @@ int amdgpu_gmc_ras_late_init(struct amdgpu_device *adev) 
	}



	if (adev->gmc.xgmi.ras && adev->gmc.xgmi.ras->ras_block.ras_late_init) {

		r = adev->gmc.xgmi.ras->ras_block.ras_late_init(adev, NULL);

		r = adev->gmc.xgmi.ras->ras_block.ras_late_init(adev, adev->gmc.xgmi.ras_if);

		if (r)

			return r;

	}

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

+3 −3
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ 
int amdgpu_nbio_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block)

{

	int r;

	r = amdgpu_ras_block_late_init(adev, adev->nbio.ras_if);

	r = amdgpu_ras_block_late_init(adev, ras_block);

	if (r)

		return r;



	if (amdgpu_ras_is_supported(adev, adev->nbio.ras_if->block)) {

	if (amdgpu_ras_is_supported(adev, ras_block->block)) {

		r = amdgpu_irq_get(adev, &adev->nbio.ras_controller_irq, 0);

		if (r)

			goto late_fini;
@@ -40,7 +40,7 @@ int amdgpu_nbio_ras_late_init(struct amdgpu_device *adev, struct ras_common_if * 


	return 0;

late_fini:

	amdgpu_ras_block_late_fini(adev, adev->nbio.ras_if);

	amdgpu_ras_block_late_fini(adev, ras_block);

	return r;

}

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

+3 −3
Original line number Diff line number Diff line
@@ -91,11 +91,11 @@ int amdgpu_sdma_ras_late_init(struct amdgpu_device *adev, 
{

	int r, i;



	r = amdgpu_ras_block_late_init(adev, adev->sdma.ras_if);

	r = amdgpu_ras_block_late_init(adev, ras_block);

	if (r)

		return r;



	if (amdgpu_ras_is_supported(adev, adev->sdma.ras_if->block)) {

	if (amdgpu_ras_is_supported(adev, ras_block->block)) {

		for (i = 0; i < adev->sdma.num_instances; i++) {

			r = amdgpu_irq_get(adev, &adev->sdma.ecc_irq,

				AMDGPU_SDMA_IRQ_INSTANCE0 + i);
@@ -107,7 +107,7 @@ int amdgpu_sdma_ras_late_init(struct amdgpu_device *adev, 
	return 0;



late_fini:

	amdgpu_ras_block_late_fini(adev, adev->sdma.ras_if);

	amdgpu_ras_block_late_fini(adev, ras_block);

	return r;

}

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

+3 −3
Original line number Diff line number Diff line
@@ -140,11 +140,11 @@ int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *r 
{

	int r;



	r = amdgpu_ras_block_late_init(adev, adev->umc.ras_if);

	r = amdgpu_ras_block_late_init(adev, ras_block);

	if (r)

		return r;



	if (amdgpu_ras_is_supported(adev, adev->umc.ras_if->block)) {

	if (amdgpu_ras_is_supported(adev, ras_block->block)) {

		r = amdgpu_irq_get(adev, &adev->gmc.ecc_irq, 0);

		if (r)

			goto late_fini;
@@ -158,7 +158,7 @@ int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *r 
	return 0;



late_fini:

	amdgpu_ras_block_late_fini(adev, adev->umc.ras_if);

	amdgpu_ras_block_late_fini(adev, ras_block);

	return r;

}