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

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



Remove redundant calls of amdgpu_ras_block_late_fini in sdma 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 aa8e65df

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

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

}



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

{

	if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__SDMA) &&

			ras_block)

		amdgpu_ras_block_late_fini(adev, ras_block);

}



int amdgpu_sdma_process_ras_data_cb(struct amdgpu_device *adev,

		void *err_data,

		struct amdgpu_iv_entry *entry)

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

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ int amdgpu_sdma_get_index_from_ring(struct amdgpu_ring *ring, uint32_t *index); 
uint64_t amdgpu_sdma_get_csa_mc_addr(struct amdgpu_ring *ring, unsigned vmid);

int amdgpu_sdma_ras_late_init(struct amdgpu_device *adev,

			      struct ras_common_if *ras_block);

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

int amdgpu_sdma_process_ras_data_cb(struct amdgpu_device *adev,

		void *err_data,

		struct amdgpu_iv_entry *entry);

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

+1 −1
Original line number Diff line number Diff line
@@ -2824,7 +2824,7 @@ static void sdma_v4_0_set_ras_funcs(struct amdgpu_device *adev) 


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

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

			adev->sdma.ras->ras_block.ras_fini = amdgpu_sdma_ras_fini;

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



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

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