Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b6aca2f authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/powerplay: fix mclk can't switch on Tonga 



regression issue caused by
commit 47047263
("drm/amd/powerplay: delete eventmgr related files.")

Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1756f1bb

drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c

+0 −1
Original line number Diff line number Diff line
@@ -292,7 +292,6 @@ int hwmgr_hw_fini(struct pp_instance *handle) 


	phm_stop_thermal_controller(hwmgr);

	psm_set_boot_states(hwmgr);

	phm_display_configuration_changed(hwmgr);

	psm_adjust_power_state_dynamic(hwmgr, false, NULL);

	phm_disable_dynamic_state_management(hwmgr);

	phm_disable_clock_power_gatings(hwmgr);

drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c

+5 −1
Original line number Diff line number Diff line
@@ -224,6 +224,8 @@ int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip, 
	if (skip)

		return 0;



	phm_display_configuration_changed(hwmgr);



	if (new_ps != NULL)

		requested = new_ps;

	else
@@ -232,7 +234,6 @@ int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip, 
	pcurrent = hwmgr->current_ps;



	phm_apply_state_adjust_rules(hwmgr, requested, pcurrent);



	if (pcurrent == NULL || (0 != phm_check_states_equal(hwmgr,

			&pcurrent->hardware, &requested->hardware, &equal)))

		equal = false;
@@ -241,6 +242,9 @@ int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip, 
		phm_set_power_state(hwmgr, &pcurrent->hardware, &requested->hardware);

		memcpy(hwmgr->current_ps, hwmgr->request_ps, hwmgr->ps_size);

	}



	phm_notify_smc_display_config_after_ps_adjustment(hwmgr);



	return 0;

}