diff options
author | Le Ma <le.ma@amd.com> | 2019-09-23 21:09:38 +0800 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2019-10-03 09:11:00 -0500 |
commit | 05ba0095fb7bf150601169ba0c4380c56f51458b (patch) | |
tree | 2b990f48140aa26cf74306f4ffefd3f22b7999c2 | |
parent | 1f01cd99051507478f8dac837c939088a894d279 (diff) | |
download | linux-stable-05ba0095fb7bf150601169ba0c4380c56f51458b.tar.gz linux-stable-05ba0095fb7bf150601169ba0c4380c56f51458b.tar.bz2 linux-stable-05ba0095fb7bf150601169ba0c4380c56f51458b.zip |
drm/amdgpu: correct condition check for psp rlc autoload
Otherwise non-autoload case will go into the wrong routine and fail.
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Le Ma <le.ma@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index 920910fb83be..76c59d5b466f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -1407,7 +1407,8 @@ out: return ret; /* Start rlc autoload after psp recieved all the gfx firmware */ - if (ucode->ucode_id == AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM) { + if (psp->autoload_supported && ucode->ucode_id == + AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM) { ret = psp_rlc_autoload(psp); if (ret) { DRM_ERROR("Failed to start rlc autoload\n"); |