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

[Deucher, Alexander]

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf
> Of Rex Zhu
> Sent: Friday, September 01, 2017 5:51 AM
> To: amd-gfx at lists.freedesktop.org
> Cc: Zhu, Rex
> Subject: [PATCH 4/4] drm/amd/powerplay: set uvd/vce/nb/mclk level as
> UMD P-state required
> 
> Change-Id: I6e5cb169fcc22525d26cdc3f82ca011249f912ef
> Signed-off-by: Rex Zhu <Rex.Zhu at amd.com>

This series is:
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

BTW, can you review my stable p-state fix for CZ?
https://patchwork.freedesktop.org/patch/174102/

Thanks,

Alex

> ---
>  drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c
> b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c
> index 573e4da..3a8bc74 100644
> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c
> @@ -1138,7 +1138,11 @@ static int cz_apply_state_adjust_rules(struct
> pp_hwmgr *hwmgr,
> 
>  	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;
>  	else if (force_high && (cz_ps->action != FORCE_HIGH))
>  		cz_ps->action = FORCE_HIGH;
> @@ -1416,7 +1420,8 @@ int cz_dpm_update_uvd_dpm(struct pp_hwmgr
> *hwmgr, bool bgate)
>  	if (!bgate) {
>  		/* Stable Pstate is enabled and we need to set the UVD DPM
> to highest level */
>  		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 =
>  				   ptable->entries[ptable->count - 1].vclk;
> 
> @@ -1445,7 +1450,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 */
>  	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 =
>  				  ptable->entries[ptable->count - 1].ecclk;
> 
> --
> 1.9.1
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx