From: Xiaojie Yuan Date: Wed, 9 Oct 2019 10:52:51 +0000 (+0800) Subject: drm/amd/powerplay: re-enable FW_DSTATE feature bit X-Git-Tag: v5.5-rc1~128^2~25^2~95 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb3d7d322dff0d367cbb802a5efb4060edd7e10e;p=thirdparty%2Fkernel%2Flinux.git drm/amd/powerplay: re-enable FW_DSTATE feature bit SMU firmware has fix the bug, so remove this workaround. Signed-off-by: Xiaojie Yuan Acked-by: Alex Deucher Reviewed-by: Kevin Wang Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c index 80e96e3412ac9..22be714ab222c 100644 --- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c +++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c @@ -372,11 +372,8 @@ navi10_get_allowed_feature_mask(struct smu_context *smu, if (adev->pm.pp_feature & PP_SCLK_DEEP_SLEEP_MASK) *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_DS_GFXCLK_BIT); - if (adev->pm.pp_feature & PP_GFXOFF_MASK) { + if (adev->pm.pp_feature & PP_GFXOFF_MASK) *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_GFXOFF_BIT); - /* TODO: remove it once fw fix the bug */ - *(uint64_t *)feature_mask &= ~FEATURE_MASK(FEATURE_FW_DSTATE_BIT); - } if (smu->adev->pg_flags & AMD_PG_SUPPORT_MMHUB) *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_MMHUB_PG_BIT);