Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-17 16:43:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/amd/powerplay: fix issue can't enable vce dpm.

Browse Source 
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Eric Huang <JinhuiEric.Huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Rex Zhu 2016-07-12 17:32:36 +08:00 committed by Alex Deucher
parent ec38f1889a
commit 990c70ad75
3 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_clockpowergating.c
View File

@ -131,11 +131,19 @@ int polaris10_phm_powergate_vce(struct pp_hwmgr *hwmgr, bool bgate)
data->vce_power_gated = bgate; data->vce_power_gated = bgate;
if (bgate) if (bgate) {
cgs_set_clockgating_state(hwmgr->device,
AMD_IP_BLOCK_TYPE_VCE,
AMD_CG_STATE_GATE);
polaris10_update_vce_dpm(hwmgr, true);
polaris10_phm_powerdown_vce(hwmgr); polaris10_phm_powerdown_vce(hwmgr);
else } else {
polaris10_phm_powerup_vce(hwmgr); polaris10_phm_powerup_vce(hwmgr);
polaris10_update_vce_dpm(hwmgr, false);
cgs_set_clockgating_state(hwmgr->device,
AMD_IP_BLOCK_TYPE_VCE,
AMD_CG_STATE_UNGATE);
}
return 0; return 0;
} }

34
drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
View File

@ -4424,25 +4424,20 @@ int polaris10_update_uvd_dpm(struct pp_hwmgr *hwmgr, bool bgate)
return polaris10_enable_disable_uvd_dpm(hwmgr, !bgate); return polaris10_enable_disable_uvd_dpm(hwmgr, !bgate);
} }
static int polaris10_update_vce_dpm(struct pp_hwmgr *hwmgr, const void *input) int polaris10_update_vce_dpm(struct pp_hwmgr *hwmgr, bool bgate)
{ {
const struct phm_set_power_state_input *states =
(const struct phm_set_power_state_input *)input;
struct polaris10_hwmgr *data = (struct polaris10_hwmgr *)(hwmgr->backend); struct polaris10_hwmgr *data = (struct polaris10_hwmgr *)(hwmgr->backend);
const struct polaris10_power_state *polaris10_nps =
cast_const_phw_polaris10_power_state(states->pnew_state);
const struct polaris10_power_state *polaris10_cps =
cast_const_phw_polaris10_power_state(states->pcurrent_state);
uint32_t mm_boot_level_offset, mm_boot_level_value; uint32_t mm_boot_level_offset, mm_boot_level_value;
struct phm_ppt_v1_information *table_info = struct phm_ppt_v1_information *table_info =
(struct phm_ppt_v1_information *)(hwmgr->pptable); (struct phm_ppt_v1_information *)(hwmgr->pptable);
if (polaris10_nps->vce_clks.evclk > 0 && if (!bgate) {
(polaris10_cps == NULL || polaris10_cps->vce_clks.evclk == 0)) { if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,
PHM_PlatformCaps_StablePState))
data->smc_state_table.VceBootLevel = data->smc_state_table.VceBootLevel =
(uint8_t) (table_info->mm_dep_table->count - 1); (uint8_t) (table_info->mm_dep_table->count - 1);
else
data->smc_state_table.VceBootLevel = 0;
mm_boot_level_offset = data->dpm_table_start + mm_boot_level_offset = data->dpm_table_start +
offsetof(SMU74_Discrete_DpmTable, VceBootLevel); offsetof(SMU74_Discrete_DpmTable, VceBootLevel);
@ -4455,18 +4450,14 @@ static int polaris10_update_vce_dpm(struct pp_hwmgr *hwmgr, const void *input)
cgs_write_ind_register(hwmgr->device, cgs_write_ind_register(hwmgr->device,
CGS_IND_REG__SMC, mm_boot_level_offset, mm_boot_level_value); CGS_IND_REG__SMC, mm_boot_level_offset, mm_boot_level_value);
if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_StablePState)) { if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_StablePState))
smum_send_msg_to_smc_with_parameter(hwmgr->smumgr, smum_send_msg_to_smc_with_parameter(hwmgr->smumgr,
PPSMC_MSG_VCEDPM_SetEnabledMask, PPSMC_MSG_VCEDPM_SetEnabledMask,
(uint32_t)1 << data->smc_state_table.VceBootLevel); (uint32_t)1 << data->smc_state_table.VceBootLevel);
polaris10_enable_disable_vce_dpm(hwmgr, true);
} else if (polaris10_nps->vce_clks.evclk == 0 &&
polaris10_cps != NULL &&
polaris10_cps->vce_clks.evclk > 0)
polaris10_enable_disable_vce_dpm(hwmgr, false);
} }
polaris10_enable_disable_vce_dpm(hwmgr, !bgate);
return 0; return 0;
} }
@ -4655,11 +4646,6 @@ static int polaris10_set_power_state_tasks(struct pp_hwmgr *hwmgr, const void *i
"Failed to generate DPM level enabled mask!", "Failed to generate DPM level enabled mask!",
result = tmp_result); result = tmp_result);
tmp_result = polaris10_update_vce_dpm(hwmgr, input);
PP_ASSERT_WITH_CODE((0 == tmp_result),
"Failed to update VCE DPM!",
result = tmp_result);
tmp_result = polaris10_update_sclk_threshold(hwmgr); tmp_result = polaris10_update_sclk_threshold(hwmgr);
PP_ASSERT_WITH_CODE((0 == tmp_result), PP_ASSERT_WITH_CODE((0 == tmp_result),
"Failed to update SCLK threshold!", "Failed to update SCLK threshold!",

2
drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h
View File

@ -352,6 +352,6 @@ int polaris10_hwmgr_init(struct pp_hwmgr *hwmgr);
int polaris10_update_uvd_dpm(struct pp_hwmgr *hwmgr, bool bgate); int polaris10_update_uvd_dpm(struct pp_hwmgr *hwmgr, bool bgate);
int polaris10_update_samu_dpm(struct pp_hwmgr *hwmgr, bool bgate); int polaris10_update_samu_dpm(struct pp_hwmgr *hwmgr, bool bgate);
int polaris10_enable_disable_vce_dpm(struct pp_hwmgr *hwmgr, bool enable); int polaris10_enable_disable_vce_dpm(struct pp_hwmgr *hwmgr, bool enable);
int polaris10_update_vce_dpm(struct pp_hwmgr *hwmgr, bool bgate);
#endif #endif