提交 a935d78e 编写于 作者: S Shirish S 提交者: Greg Kroah-Hartman

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

[ Upstream commit 00fedbe629bfc0a51c07b6e665265ce31d8b6f3c ]

This reverts commit dbd8299c32f6f413f6cfe322fe0308f3cfc577e8.

Reason for revert:
This patch sends  msg PPSMC_MSG_DisableLowMemoryPstate(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: NShirish S <shirish.s@amd.com>
Signed-off-by: Nsuresh guttula <suresh.guttula@amd.com>
Reviewed-by: NAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
上级 288831cb
...@@ -1222,17 +1222,14 @@ static int smu8_dpm_force_dpm_level(struct pp_hwmgr *hwmgr, ...@@ -1222,17 +1222,14 @@ static int smu8_dpm_force_dpm_level(struct pp_hwmgr *hwmgr,
static int smu8_dpm_powerdown_uvd(struct pp_hwmgr *hwmgr) static int smu8_dpm_powerdown_uvd(struct pp_hwmgr *hwmgr)
{ {
if (PP_CAP(PHM_PlatformCaps_UVDPowerGating)) { if (PP_CAP(PHM_PlatformCaps_UVDPowerGating))
smu8_nbdpm_pstate_enable_disable(hwmgr, true, true);
return smum_send_msg_to_smc(hwmgr, PPSMC_MSG_UVDPowerOFF); return smum_send_msg_to_smc(hwmgr, PPSMC_MSG_UVDPowerOFF);
}
return 0; return 0;
} }
static int smu8_dpm_powerup_uvd(struct pp_hwmgr *hwmgr) static int smu8_dpm_powerup_uvd(struct pp_hwmgr *hwmgr)
{ {
if (PP_CAP(PHM_PlatformCaps_UVDPowerGating)) { if (PP_CAP(PHM_PlatformCaps_UVDPowerGating)) {
smu8_nbdpm_pstate_enable_disable(hwmgr, false, true);
return smum_send_msg_to_smc_with_parameter( return smum_send_msg_to_smc_with_parameter(
hwmgr, hwmgr,
PPSMC_MSG_UVDPowerON, PPSMC_MSG_UVDPowerON,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册