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

Commit 73afe621 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/powerplay: enable set_cpu_power_state task. (v2) 



v2: integrate Jammy's crash fix

Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarJammy Zhou <Jammy.Zhou@amd.com>
parent 7fb72a1f

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

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ const struct action_chain disable_user_2d_performance_action_chain = { 
static const pem_event_action *display_config_change_event[] = {

	/* countDisplayConfigurationChangeEventTasks, */

	unblock_adjust_power_state_tasks,

	/* setCPUPowerState,*/

	set_cpu_power_state,

	notify_hw_power_source_tasks,

	/* updateDALConfigurationTasks,

	variBrightDisplayConfigurationChangeTasks, */

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

+5 −0
Original line number Diff line number Diff line
@@ -403,3 +403,8 @@ const pem_event_action uninitialize_thermal_controller_tasks[] = { 
	pem_task_uninitialize_thermal_controller,

	NULL

};



const pem_event_action set_cpu_power_state[] = {

	pem_task_set_cpu_power_state,

	NULL

};
 
 No newline at end of file

drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.h

+1 −0
Original line number Diff line number Diff line
@@ -96,4 +96,5 @@ extern const pem_event_action reset_boot_state_tasks[]; 
extern const pem_event_action create_new_user_performance_state_tasks[];

extern const pem_event_action initialize_thermal_controller_tasks[];

extern const pem_event_action uninitialize_thermal_controller_tasks[];

extern const pem_event_action set_cpu_power_state[];

#endif /* _EVENT_SUB_CHAINS_H_ */

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

+1 −2
Original line number Diff line number Diff line
@@ -248,8 +248,7 @@ int pem_task_reset_display_phys_access(struct pp_eventmgr *eventmgr, struct pem_ 


int pem_task_set_cpu_power_state(struct pp_eventmgr *eventmgr, struct pem_event_data *event_data)

{

	/* TODO */

	return 0;

	return phm_set_cpu_power_state(eventmgr->hwmgr);

}



/*powersaving*/

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

+11 −2
Original line number Diff line number Diff line
@@ -260,3 +260,12 @@ int phm_store_dal_configuration_data(struct pp_hwmgr *hwmgr, 
					display_config->nb_pstate_switch_disable);



}



int phm_set_cpu_power_state(struct pp_hwmgr *hwmgr)

{

	if (hwmgr != NULL && hwmgr->hwmgr_func->set_cpu_power_state != NULL)

		return hwmgr->hwmgr_func->set_cpu_power_state(hwmgr);



	return 0;

}