From: Eric Huang Date: Mon, 13 Mar 2017 18:15:48 +0000 (-0400) Subject: drm/amd/powerplay: restore disabling power containment on Fiji (v2) X-Git-Tag: Ubuntu-5.10.0-12.13~10409^2~23^2~161 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=923d26db85e8188bdbfeb7f8d70dfd86d901d4f0;p=mirror_ubuntu-hirsute-kernel.git drm/amd/powerplay: restore disabling power containment on Fiji (v2) Power containment will degrade performance in some compute tests. Restore disabling it as before code refining in powerplay. v2: only in the compute profile Signed-off-by: Eric Huang Reviewed-by: Felix Kuehling Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c index 154d9a29749c..604ffea83757 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c @@ -4576,6 +4576,13 @@ static int smu7_set_power_profile_state(struct pp_hwmgr *hwmgr, int tmp_result, result = 0; uint32_t sclk_mask = 0, mclk_mask = 0; + if (hwmgr->chip_id == CHIP_FIJI) { + if (request->type == AMD_PP_GFX_PROFILE) + smu7_enable_power_containment(hwmgr); + else if (request->type == AMD_PP_COMPUTE_PROFILE) + smu7_disable_power_containment(hwmgr); + } + if (hwmgr->dpm_level != AMD_DPM_FORCED_LEVEL_AUTO) return -EINVAL;