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

Commit 92bc0650 authored by Evan Quan's avatar Evan Quan Committed by Greg Kroah-Hartman
Browse files

drm/amd/powerplay: issue pre-display settings for display change event 



[ Upstream commit 10cb3e6b63bf4266a5198813526fdd7259ffb8be ]

For display config change event only, pre-display config settings are
needed.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ee404810

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

+3 −0
Original line number Diff line number Diff line
@@ -365,6 +365,9 @@ int hwmgr_handle_task(struct pp_hwmgr *hwmgr, enum amd_pp_task task_id, 


	switch (task_id) {

	case AMD_PP_TASK_DISPLAY_CONFIG_CHANGE:

		ret = phm_pre_display_configuration_changed(hwmgr);

		if (ret)

			return ret;

		ret = phm_set_cpu_power_state(hwmgr);

		if (ret)

			return ret;

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

+0 −2
Original line number Diff line number Diff line
@@ -265,8 +265,6 @@ int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip, 
	if (skip)

		return 0;



	phm_pre_display_configuration_changed(hwmgr);



	phm_display_configuration_changed(hwmgr);



	if (hwmgr->ps)