Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: yipechai <YiPeng.Chai@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

yipechai and committed by
Alex Deucher
149d7ba1 aa8e65df

+1 -9
-7
drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
··· 111 111 return r; 112 112 } 113 113 114 - void amdgpu_sdma_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block) 115 - { 116 - if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__SDMA) && 117 - ras_block) 118 - amdgpu_ras_block_late_fini(adev, ras_block); 119 - } 120 - 121 114 int amdgpu_sdma_process_ras_data_cb(struct amdgpu_device *adev, 122 115 void *err_data, 123 116 struct amdgpu_iv_entry *entry)
-1
drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h
··· 118 118 uint64_t amdgpu_sdma_get_csa_mc_addr(struct amdgpu_ring *ring, unsigned vmid); 119 119 int amdgpu_sdma_ras_late_init(struct amdgpu_device *adev, 120 120 struct ras_common_if *ras_block); 121 - void amdgpu_sdma_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block); 122 121 int amdgpu_sdma_process_ras_data_cb(struct amdgpu_device *adev, 123 122 void *err_data, 124 123 struct amdgpu_iv_entry *entry);
+1 -1
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
··· 2824 2824 2825 2825 /* If don't define special ras_fini function, use default ras_fini */ 2826 2826 if (!adev->sdma.ras->ras_block.ras_fini) 2827 - adev->sdma.ras->ras_block.ras_fini = amdgpu_sdma_ras_fini; 2827 + adev->sdma.ras->ras_block.ras_fini = amdgpu_ras_block_late_fini; 2828 2828 2829 2829 /* If not defined special ras_cb function, use default ras_cb */ 2830 2830 if (!adev->sdma.ras->ras_block.ras_cb)