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

drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in gfx ras block 



Remove redundant calls of amdgpu_ras_block_late_fini in gfx 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 1f211a82

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

+0 −7
Original line number Diff line number Diff line
@@ -644,13 +644,6 @@ int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *r 
	return r;

}



void amdgpu_gfx_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block)

{

	if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__GFX) &&

			ras_block)

		amdgpu_ras_block_late_fini(adev, ras_block);

}



int amdgpu_gfx_process_ras_data_cb(struct amdgpu_device *adev,

		void *err_data,

		struct amdgpu_iv_entry *entry)

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

+0 −1
Original line number Diff line number Diff line
@@ -387,7 +387,6 @@ bool amdgpu_gfx_is_me_queue_enabled(struct amdgpu_device *adev, int me, 
void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable);

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);

void amdgpu_gfx_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block);

int amdgpu_gfx_process_ras_data_cb(struct amdgpu_device *adev,

		void *err_data,

		struct amdgpu_iv_entry *entry);

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

+1 −1
Original line number Diff line number Diff line
@@ -2206,7 +2206,7 @@ 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;

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



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

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