]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/amd/powerplay: add enabling voltage controller back
authorHuang Rui <ray.huang@amd.com>
Tue, 26 Jul 2016 08:33:41 +0000 (16:33 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 8 Aug 2016 15:32:32 +0000 (11:32 -0400)
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 6075050b891f7a4b840480ea5fb6c54149717c14..d538d28fa8b369e5ffb932c272dea6682db50013 100644 (file)
@@ -2970,13 +2970,11 @@ int iceland_start_dpm(struct pp_hwmgr *hwmgr)
 
        PHM_WRITE_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__PCIE, SWRST_COMMAND_1, RESETLC, 0x0);
 
-#if 0
        PP_ASSERT_WITH_CODE(
                        (0 == smum_send_msg_to_smc(hwmgr->smumgr,
                                        PPSMC_MSG_Voltage_Cntl_Enable)),
                        "Failed to enable voltage DPM during DPM Start Function!",
                        return -1);
-#endif
 
        if (0 != iceland_enable_sclk_mclk_dpm(hwmgr)) {
                PP_ASSERT_WITH_CODE(0, "Failed to enable Sclk DPM and Mclk DPM!", return -1);