From: Jack Xiao <Jack.Xiao@xxxxxxx> Call general mes initialization/finalization. Signed-off-by: Jack Xiao <Jack.Xiao@xxxxxxx> Acked-by: Christian König <christian.koenig@xxxxxxx> Reviewed-by: Hawking Zhang <Hawking.Zhang@xxxxxxx> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> --- drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v10_1.c b/drivers/gpu/drm/amd/amdgpu/mes_v10_1.c index d77242e0360e..94812164998a 100644 --- a/drivers/gpu/drm/amd/amdgpu/mes_v10_1.c +++ b/drivers/gpu/drm/amd/amdgpu/mes_v10_1.c @@ -935,6 +935,10 @@ static int mes_v10_1_sw_init(void *handle) adev->mes.funcs = &mes_v10_1_funcs; adev->mes.kiq_hw_init = &mes_v10_1_kiq_hw_init; + r = amdgpu_mes_init(adev); + if (r) + return r; + for (pipe = 0; pipe < AMDGPU_MAX_MES_PIPES; pipe++) { if (!adev->enable_mes_kiq && pipe == AMDGPU_MES_KIQ_PIPE) continue; @@ -994,6 +998,7 @@ static int mes_v10_1_sw_fini(void *handle) amdgpu_ring_fini(&adev->gfx.kiq.ring); amdgpu_ring_fini(&adev->mes.ring); + amdgpu_mes_fini(adev); return 0; } -- 2.35.1