drm/amd/powerplay: fix mclk not switching back after multi-head was disabled
authorRex Zhu <Rex.Zhu@amd.com>
Wed, 14 Sep 2016 05:20:34 +0000 (13:20 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 19 Sep 2016 17:22:08 +0000 (13:22 -0400)
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c
drivers/gpu/drm/amd/powerplay/eventmgr/psm.c

index 635fc4b4818484c1741d1404024452382c8a5fcc..92b1178438755ab4e981dfa14741f62a3353da9f 100644 (file)
@@ -262,6 +262,8 @@ static const pem_event_action * const display_config_change_event[] = {
        unblock_adjust_power_state_tasks,
        set_cpu_power_state,
        notify_hw_power_source_tasks,
+       get_2d_performance_state_tasks,
+       set_performance_state_tasks,
        /* updateDALConfigurationTasks,
        variBrightDisplayConfigurationChangeTasks, */
        adjust_power_state_tasks,
index 1d1875a7cb2dadf922667047223248ebc929ec3d..489908887e9c08f90cb7c4d83e84a1883c0d68ef 100644 (file)
@@ -101,11 +101,12 @@ int psm_adjust_power_state_dynamic(struct pp_eventmgr *eventmgr, bool skip)
        if (requested == NULL)
                return 0;
 
+       phm_apply_state_adjust_rules(hwmgr, requested, pcurrent);
+
        if (pcurrent == NULL || (0 != phm_check_states_equal(hwmgr, &pcurrent->hardware, &requested->hardware, &equal)))
                equal = false;
 
        if (!equal || phm_check_smc_update_required_for_display_configuration(hwmgr)) {
-               phm_apply_state_adjust_rules(hwmgr, requested, pcurrent);
                phm_set_power_state(hwmgr, &pcurrent->hardware, &requested->hardware);
                memcpy(hwmgr->current_ps, hwmgr->request_ps, hwmgr->ps_size);
        }