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

drm/amdgpu: Optimize amdgpu_mmhub_ras_late_init/amdgpu_mmhub_ras_fini function code 



Optimize amdgpu_mmhub_ras_late_init/amdgpu_mmhub_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 88bc3cd8

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

+3 −34
Original line number Diff line number Diff line
@@ -26,43 +26,12 @@ 


int amdgpu_mmhub_ras_late_init(struct amdgpu_device *adev, void *ras_info)

{

	int r;

	struct ras_ih_if ih_info = {

		.cb = NULL,

	};

	struct ras_fs_if fs_info = {

		.sysfs_name = "mmhub_err_count",

	};



	if (!adev->mmhub.ras_if) {

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

		if (!adev->mmhub.ras_if)

			return -ENOMEM;

		adev->mmhub.ras_if->block = AMDGPU_RAS_BLOCK__MMHUB;

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

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

	}

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

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

				 &fs_info, &ih_info);

	if (r || !amdgpu_ras_is_supported(adev, adev->mmhub.ras_if->block)) {

		kfree(adev->mmhub.ras_if);

		adev->mmhub.ras_if = NULL;

	}



	return r;

	return amdgpu_ras_block_late_init(adev, adev->mmhub.ras_if);

}



void amdgpu_mmhub_ras_fini(struct amdgpu_device *adev)

{

	if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__MMHUB) &&

			adev->mmhub.ras_if) {

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

		struct ras_ih_if ih_info = {

			.cb = NULL,

		};



		amdgpu_ras_late_fini(adev, ras_if, &ih_info);

		kfree(ras_if);

	}

			adev->mmhub.ras_if)

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

}

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

+2 −0
Original line number Diff line number Diff line
@@ -1282,6 +1282,8 @@ static void gmc_v9_0_set_mmhub_ras_funcs(struct amdgpu_device *adev) 


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

		adev->mmhub.ras->ras_block.ras_comm.block = AMDGPU_RAS_BLOCK__MMHUB;

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

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



		/* If don't define special ras_late_init function, use default ras_late_init */

		if (!adev->mmhub.ras->ras_block.ras_late_init)