drm/amdgpu/mes10.1: call general mes initialization

Call general mes initialization/finalization.

Signed-off-by: Jack Xiao <Jack.Xiao@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v10_1.c b/drivers/gpu/drm/amd/amdgpu/mes_v10_1.c
index d77242e0360edd5721d7368499f966e468202059..94812164998a472e0a967d3049da6c612627a877 100644 (file)
--- 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;
 }