From: Xiaojie Yuan Date: Wed, 17 Jul 2019 21:00:00 +0000 (+0800) Subject: drm/amdgpu: start autoload till RLCG fw for navi12 X-Git-Tag: v5.4-rc1~106^2~17^2~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e60cc94b268a65cc46f8fd430e98e764a4f46370;p=thirdparty%2Flinux.git drm/amdgpu: start autoload till RLCG fw for navi12 rlc save restore list is not ready yet for navi12 Signed-off-by: Xiaojie Yuan Reviewed-by: Jack Xiao Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index d1ac73eca06aa..51fb890e2d3bc 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -1025,7 +1025,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 (ucode->ucode_id == AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM || + (adev->asic_type == CHIP_NAVI12 && ucode->ucode_id == AMDGPU_UCODE_ID_RLC_G)) { ret = psp_rlc_autoload(psp); if (ret) { DRM_ERROR("Failed to start rlc autoload\n");