From 4df80927377b82e139a5d79151a824a3fb6ce787 Mon Sep 17 00:00:00 2001 From: Jack Xiao Date: Wed, 25 Mar 2020 18:27:19 +0800 Subject: [PATCH] drm/amdgpu/mes10.1: call general mes initialization MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Call general mes initialization/finalization. Signed-off-by: Jack Xiao Acked-by: Christian König Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher --- 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 d77242e0360ed..94812164998a4 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.30.2