diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2016-02-02 16:22:15 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-02-02 22:54:32 -0500 |
| commit | 951e09624a9f417f0b64c872f71feb6738905086 (patch) | |
| tree | f14a0770ff2523408d5298c7e9a4a6c7b505d5d2 | |
| parent | 97dde76a30c2e67fa5fb9cb6a4072c0178c9df26 (diff) | |
| download | linux-stable-951e09624a9f417f0b64c872f71feb6738905086.tar.gz linux-stable-951e09624a9f417f0b64c872f71feb6738905086.tar.bz2 linux-stable-951e09624a9f417f0b64c872f71feb6738905086.zip | |
drm/amdgpu: load MEC ucode manually on iceland
The smc doesn't handle it.
Reviewed-by: Ken Wang <Qingqing.Wang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c index 87c3332f45e3..8f8ec37ecd88 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c @@ -3851,10 +3851,16 @@ static int gfx_v8_0_cp_resume(struct amdgpu_device *adev) if (r) return -EINVAL; - r = adev->smu.smumgr_funcs->check_fw_load_finish(adev, - AMDGPU_UCODE_ID_CP_MEC1); - if (r) - 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, + AMDGPU_UCODE_ID_CP_MEC1); + if (r) + return -EINVAL; + } } } |