Commit 1dd5ead2 authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

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: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3e81ee9a
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@ struct amdgpu_sdma_instance {
};

struct amdgpu_sdma_ras_funcs {
	int (*ras_late_init)(struct amdgpu_device *adev,
			void *ras_ih_info);
	void (*ras_fini)(struct amdgpu_device *adev);
	int (*query_ras_error_count)(struct amdgpu_device *adev,
			uint32_t instance, void *ras_error_status);
};
+4 −2
Original line number Diff line number Diff line
@@ -1802,7 +1802,7 @@ static int sdma_v4_0_late_init(void *handle)
		.cb = sdma_v4_0_process_ras_data_cb,
	};

	return amdgpu_sdma_ras_late_init(adev, &ih_info);
	return adev->sdma.funcs->ras_late_init(adev, &ih_info);
}

static int sdma_v4_0_sw_init(void *handle)
@@ -1874,7 +1874,7 @@ static int sdma_v4_0_sw_fini(void *handle)
	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
	int i;

	amdgpu_sdma_ras_fini(adev);
	adev->sdma.funcs->ras_fini(adev);

	for (i = 0; i < adev->sdma.num_instances; i++) {
		amdgpu_ring_fini(&adev->sdma.instance[i].ring);
@@ -2562,6 +2562,8 @@ static int sdma_v4_0_query_ras_error_count(struct amdgpu_device *adev,
};

static const struct amdgpu_sdma_ras_funcs sdma_v4_0_ras_funcs = {
	.ras_late_init = amdgpu_sdma_ras_late_init,
	.ras_fini = amdgpu_sdma_ras_fini,
	.query_ras_error_count = sdma_v4_0_query_ras_error_count,
};