From 7380d973669042490c0d393daa5e972b5dc0ed09 Mon Sep 17 00:00:00 2001 From: Xiaojie Yuan Date: Wed, 9 Oct 2019 18:52:51 +0800 Subject: [PATCH 4121/4736] 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 --- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c index 52a2feef7893..e8e5c889cc95 100644 --- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c +++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c @@ -371,11 +371,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); -- 2.17.1