浏览代码

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

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

Signed-off-by: Evan Quan <evan.quan@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Evan Quan 6 年之前
父节点
当前提交
10cb3e6b63
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 3 0
      drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
  2. 0 2
      drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c

+ 3 - 0
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c

@@ -352,6 +352,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;

+ 0 - 2
drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c

@@ -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)