drm/amdgpu/gfx9.4.3: Explicitly halt MEC before init

Need to make sure it's halted as we don't know what state
the GPU may have been left in previously.

Tested-by: Amber Lin <Amber.Lin@amd.com>
Acked-by: Amber Lin <Amber.Lin@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
index 611659404703d9d5b31dfe37bb4f9a13457f85ab..c100845409f7948cd060c2e44d978aec8bf35997 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
@@ -2248,6 +2248,8 @@ static int gfx_v9_4_3_xcc_cp_resume(struct amdgpu_device *adev, int xcc_id)
                r = gfx_v9_4_3_xcc_cp_compute_load_microcode(adev, xcc_id);
                if (r)
                        return r;
+       } else {
+               gfx_v9_4_3_xcc_cp_compute_enable(adev, false, xcc_id);
        }
 
        r = gfx_v9_4_3_xcc_kiq_resume(adev, xcc_id);