Commit 951e0962 authored by Alex Deucher's avatar Alex Deucher

drm/amdgpu: load MEC ucode manually on iceland

The smc doesn't handle it.
Reviewed-by: default avatarKen Wang <Qingqing.Wang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 97dde76a
...@@ -3851,12 +3851,18 @@ static int gfx_v8_0_cp_resume(struct amdgpu_device *adev) ...@@ -3851,12 +3851,18 @@ static int gfx_v8_0_cp_resume(struct amdgpu_device *adev)
if (r) if (r)
return -EINVAL; return -EINVAL;
if (adev->asic_type == CHIP_TOPAZ) {
r = gfx_v8_0_cp_compute_load_microcode(adev);
if (r)
return r;
} else {
r = adev->smu.smumgr_funcs->check_fw_load_finish(adev, r = adev->smu.smumgr_funcs->check_fw_load_finish(adev,
AMDGPU_UCODE_ID_CP_MEC1); AMDGPU_UCODE_ID_CP_MEC1);
if (r) if (r)
return -EINVAL; return -EINVAL;
} }
} }
}
r = gfx_v8_0_cp_gfx_resume(adev); r = gfx_v8_0_cp_gfx_resume(adev);
if (r) if (r)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment