[PATCH] Revert "drm/amd/powerplay: Enable/Disable NBPSTATE on On/OFF of UVD"

[Zhu, Rex]

Patch is Acked-by: Rex Zhu <Rex.Zhu at amd.com>

Regards
Rex

> -----Original Message-----
> From: S, Shirish
> Sent: Friday, October 26, 2018 12:28 AM
> To: Zhu, Rex <Rex.Zhu at amd.com>; Agrawal, Akshu
> <Akshu.Agrawal at amd.com>; Deucher, Alexander
> <Alexander.Deucher at amd.com>
> Cc: amd-gfx at lists.freedesktop.org; S, Shirish <Shirish.S at amd.com>
> Subject: [PATCH] Revert "drm/amd/powerplay: Enable/Disable NBPSTATE on
> On/OFF of UVD"
> 
> This reverts commit dbd8299c32f6f413f6cfe322fe0308f3cfc577e8.
> 
> Reason for revert:
> This patch sends  msg PPSMC_MSG_Disabl eLowMemoryPstate(0x002e)
> in wrong of sequence to SMU which is before PPSMC_MSG_UVDPowerON
> (0x0008).
> This leads to SMU failing to service the request as it is dependent on UVD to
> be powered ON, since it accesses UVD registers.
> 
> This msg should ideally be sent only when the UVD is about to decode a 4k
> video.
> 
> Signed-off-by: Shirish S <shirish.s at amd.com>
> ---
>  drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c
> b/drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c
> index fef111d..53cf787 100644
> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c
> @@ -1228,17 +1228,14 @@ static int smu8_dpm_force_dpm_level(struct
> pp_hwmgr *hwmgr,
> 
>  static int smu8_dpm_powerdown_uvd(struct pp_hwmgr *hwmgr)  {
> -	if (PP_CAP(PHM_PlatformCaps_UVDPowerGating)) {
> -		smu8_nbdpm_pstate_enable_disable(hwmgr, true, true);
> +	if (PP_CAP(PHM_PlatformCaps_UVDPowerGating))
>  		return smum_send_msg_to_smc(hwmgr,
> PPSMC_MSG_UVDPowerOFF);
> -	}
>  	return 0;
>  }
> 
>  static int smu8_dpm_powerup_uvd(struct pp_hwmgr *hwmgr)  {
>  	if (PP_CAP(PHM_PlatformCaps_UVDPowerGating)) {
> -		smu8_nbdpm_pstate_enable_disable(hwmgr, false, true);
>  		return smum_send_msg_to_smc_with_parameter(
>  			hwmgr,
>  			PPSMC_MSG_UVDPowerON,
> --
> 2.7.4