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

drm/amdgpu: Optimize amdgpu_gfx_ras_late_init/amdgpu_gfx_ras_fini function code 



Optimize amdgpu_gfx_ras_late_init/amdgpu_gfx_ras_fini function code.

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 bdb3489c

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

+5 −37
Original line number Diff line number Diff line
@@ -625,26 +625,9 @@ int amdgpu_get_gfx_off_status(struct amdgpu_device *adev, uint32_t *value) 
int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, void *ras_info)

{

	int r;

	struct ras_fs_if fs_info = {

		.sysfs_name = "gfx_err_count",

	};

	struct ras_ih_if ih_info = {

		.cb = amdgpu_gfx_process_ras_data_cb,

	};



	if (!adev->gfx.ras_if) {

		adev->gfx.ras_if = kmalloc(sizeof(struct ras_common_if), GFP_KERNEL);

		if (!adev->gfx.ras_if)

			return -ENOMEM;

		adev->gfx.ras_if->block = AMDGPU_RAS_BLOCK__GFX;

		adev->gfx.ras_if->type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;

		adev->gfx.ras_if->sub_block_index = 0;

	}

	fs_info.head = ih_info.head = *adev->gfx.ras_if;

	r = amdgpu_ras_late_init(adev, adev->gfx.ras_if,

				 &fs_info, &ih_info);

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

	if (r)

		goto free;

		return r;



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

		if (!amdgpu_persistent_edc_harvesting_supported(adev))
@@ -653,34 +636,19 @@ int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, void *ras_info) 
		r = amdgpu_irq_get(adev, &adev->gfx.cp_ecc_error_irq, 0);

		if (r)

			goto late_fini;

	} else {

		/* free gfx ras_if if ras is not supported */

		r = 0;

		goto free;

	}



	return 0;

late_fini:

	amdgpu_ras_late_fini(adev, adev->gfx.ras_if, &ih_info);

free:

	kfree(adev->gfx.ras_if);

	adev->gfx.ras_if = NULL;

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

	return r;

}



void amdgpu_gfx_ras_fini(struct amdgpu_device *adev)

{

	if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__GFX) &&

			adev->gfx.ras_if) {

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

		struct ras_ih_if ih_info = {

			.head = *ras_if,

			.cb = amdgpu_gfx_process_ras_data_cb,

		};



		amdgpu_ras_late_fini(adev, ras_if, &ih_info);

		kfree(ras_if);

	}

			adev->gfx.ras_if)

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

}



int amdgpu_gfx_process_ras_data_cb(struct amdgpu_device *adev,

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

+6 −0
Original line number Diff line number Diff line
@@ -2197,6 +2197,8 @@ static int gfx_v9_0_gpu_early_init(struct amdgpu_device *adev) 


		strcpy(adev->gfx.ras->ras_block.ras_comm.name, "gfx");

		adev->gfx.ras->ras_block.ras_comm.block = AMDGPU_RAS_BLOCK__GFX;

		adev->gfx.ras->ras_block.ras_comm.type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;

		adev->gfx.ras_if = &adev->gfx.ras->ras_block.ras_comm;



		/* If not define special ras_late_init function, use gfx default ras_late_init */

		if (!adev->gfx.ras->ras_block.ras_late_init)
@@ -2205,6 +2207,10 @@ static int gfx_v9_0_gpu_early_init(struct amdgpu_device *adev) 
		/* If not define special ras_fini function, use gfx default ras_fini */

		if (!adev->gfx.ras->ras_block.ras_fini)

			adev->gfx.ras->ras_block.ras_fini = amdgpu_gfx_ras_fini;



		/* If not defined special ras_cb function, use default ras_cb */

		if (!adev->gfx.ras->ras_block.ras_cb)

			adev->gfx.ras->ras_block.ras_cb = amdgpu_gfx_process_ras_data_cb;

	}



	adev->gfx.config.gb_addr_config = gb_addr_config;