From: Feifei Xu Date: Mon, 29 Mar 2021 07:56:14 +0000 (+0800) Subject: drm/amdgpu: skip PP_MP1_STATE_UNLOAD on aldebaran X-Git-Tag: v5.13-rc1~123^2~3^2~92 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0698b13403788a646073fcd9b2294f2dce0ce429;p=thirdparty%2Flinux.git drm/amdgpu: skip PP_MP1_STATE_UNLOAD on aldebaran This message is not needed on Aldebaran. Signed-off-by: Feifei Xu Reviewed-by: Lijo Lazar 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 389730a38e19a..9e769cf6095be 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -2172,8 +2172,7 @@ static int psp_load_smu_fw(struct psp_context *psp) if ((amdgpu_in_reset(adev) && ras && ras->supported && (adev->asic_type == CHIP_ARCTURUS || - adev->asic_type == CHIP_VEGA20 || - adev->asic_type == CHIP_ALDEBARAN)) || + adev->asic_type == CHIP_VEGA20)) || (adev->in_runpm && adev->asic_type >= CHIP_NAVI10 && adev->asic_type <= CHIP_NAVI12)) {