Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 238e793f authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/powerplay: set uvd/vce/nb/mclk level as UMD P-state required 



Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9947f704

drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c

+9 −3
Original line number Original line Diff line number Diff line
@@ -1138,7 +1138,11 @@ static int cz_apply_state_adjust_rules(struct pp_hwmgr *hwmgr, 




	cz_ps->action = cz_current_ps->action;

	cz_ps->action = cz_current_ps->action;





	if (!force_high && (cz_ps->action == FORCE_HIGH))

	if (hwmgr->request_dpm_level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)

		cz_nbdpm_pstate_enable_disable(hwmgr, false, false);

	else if (hwmgr->request_dpm_level == AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD)

		cz_nbdpm_pstate_enable_disable(hwmgr, false, true);

	else if (!force_high && (cz_ps->action == FORCE_HIGH))

		cz_ps->action = CANCEL_FORCE_HIGH;

		cz_ps->action = CANCEL_FORCE_HIGH;

	else if (force_high && (cz_ps->action != FORCE_HIGH))

	else if (force_high && (cz_ps->action != FORCE_HIGH))

		cz_ps->action = FORCE_HIGH;

		cz_ps->action = FORCE_HIGH;
@@ -1374,7 +1378,8 @@ int cz_dpm_update_uvd_dpm(struct pp_hwmgr *hwmgr, bool bgate) 
	if (!bgate) {

	if (!bgate) {

		/* Stable Pstate is enabled and we need to set the UVD DPM to highest level */

		/* Stable Pstate is enabled and we need to set the UVD DPM to highest level */

		if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,

		if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,

					 PHM_PlatformCaps_StablePState)) {

					 PHM_PlatformCaps_StablePState)

			|| hwmgr->en_umd_pstate) {

			cz_hwmgr->uvd_dpm.hard_min_clk =

			cz_hwmgr->uvd_dpm.hard_min_clk =

				   ptable->entries[ptable->count - 1].vclk;

				   ptable->entries[ptable->count - 1].vclk;
@@ -1403,7 +1408,8 @@ int cz_dpm_update_vce_dpm(struct pp_hwmgr *hwmgr) 




	/* Stable Pstate is enabled and we need to set the VCE DPM to highest level */

	/* Stable Pstate is enabled and we need to set the VCE DPM to highest level */

	if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,

	if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,

					 PHM_PlatformCaps_StablePState)) {

					PHM_PlatformCaps_StablePState)

					|| hwmgr->en_umd_pstate) {

		cz_hwmgr->vce_dpm.hard_min_clk =

		cz_hwmgr->vce_dpm.hard_min_clk =

				  ptable->entries[ptable->count - 1].ecclk;

				  ptable->entries[ptable->count - 1].ecclk;