OSDN Git Service

drm/amd/powerplay: add DPM running checking back
authorHuang Rui <ray.huang@amd.com>
Tue, 26 Jul 2016 08:38:36 +0000 (16:38 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 8 Aug 2016 15:32:34 +0000 (11:32 -0400)
This patch adds DPM running checking back, because the DPM issue is
fixed.

Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Ken Wang <Qingqing.Wang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.c

index d538d28..d8ca59b 100644 (file)
@@ -4239,11 +4239,9 @@ int iceland_unforce_dpm_levels(struct pp_hwmgr *hwmgr)
 {
        iceland_hwmgr *data = (iceland_hwmgr *)(hwmgr->backend);
 
-#if 0
        PP_ASSERT_WITH_CODE (0 == iceland_is_dpm_running(hwmgr),
                "Trying to Unforce DPM when DPM is disabled. Returning without sending SMC message.",
                return -1);
-#endif
 
        if (0 == data->sclk_dpm_key_disabled) {
                PP_ASSERT_WITH_CODE((0 == smum_send_msg_to_smc(