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

drm/amdgpu: add ras_late_init and ras_fini for sdma v4

move ras_late_init and ras_fini to sdma_ras_funcs table

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Hawking Zhang and committed by
Alex Deucher
1dd5ead2 3e81ee9a

+7 -2
+3
drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h
··· 51 51 }; 52 52 53 53 struct amdgpu_sdma_ras_funcs { 54 + int (*ras_late_init)(struct amdgpu_device *adev, 55 + void *ras_ih_info); 56 + void (*ras_fini)(struct amdgpu_device *adev); 54 57 int (*query_ras_error_count)(struct amdgpu_device *adev, 55 58 uint32_t instance, void *ras_error_status); 56 59 };
+4 -2
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
··· 1802 1802 .cb = sdma_v4_0_process_ras_data_cb, 1803 1803 }; 1804 1804 1805 - return amdgpu_sdma_ras_late_init(adev, &ih_info); 1805 + return adev->sdma.funcs->ras_late_init(adev, &ih_info); 1806 1806 } 1807 1807 1808 1808 static int sdma_v4_0_sw_init(void *handle) ··· 1874 1874 struct amdgpu_device *adev = (struct amdgpu_device *)handle; 1875 1875 int i; 1876 1876 1877 - amdgpu_sdma_ras_fini(adev); 1877 + adev->sdma.funcs->ras_fini(adev); 1878 1878 1879 1879 for (i = 0; i < adev->sdma.num_instances; i++) { 1880 1880 amdgpu_ring_fini(&adev->sdma.instance[i].ring); ··· 2562 2562 }; 2563 2563 2564 2564 static const struct amdgpu_sdma_ras_funcs sdma_v4_0_ras_funcs = { 2565 + .ras_late_init = amdgpu_sdma_ras_late_init, 2566 + .ras_fini = amdgpu_sdma_ras_fini, 2565 2567 .query_ras_error_count = sdma_v4_0_query_ras_error_count, 2566 2568 }; 2567 2569