Commit 9716ebc3 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/powerplay: fix mclk not switching back after multi-head was disabled 



Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent f2aba352

drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c

+2 −0
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/amd/powerplay/eventmgr/psm.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE