From: Evan Quan Date: Tue, 25 May 2021 02:47:41 +0000 (+0800) Subject: drm/amd/pm: correct the dpm features disablement for Navi1x X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2f0cf910379863c1e26a5cf52fd6d017b13ce6e8;p=linux.git drm/amd/pm: correct the dpm features disablement for Navi1x For BACO scenario, PMFW will handle the dpm features disablement and interaction with RLC properly. Driver involvement is unnecessary and error prone. Signed-off-by: Evan Quan Reviewed-by: Lijo Lazar Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c index e6673753595c8..a6029a88929bb 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c @@ -1387,7 +1387,8 @@ static int smu_disable_dpms(struct smu_context *smu) * For Sienna_Cichlid, PMFW will handle the features disablement properly * on BACO in. Driver involvement is unnecessary. */ - if ((adev->asic_type == CHIP_SIENNA_CICHLID) && + if (((adev->asic_type == CHIP_SIENNA_CICHLID) || + ((adev->asic_type >= CHIP_NAVI10) && (adev->asic_type <= CHIP_NAVI12))) && use_baco) return smu_disable_all_features_with_exception(smu, true,