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

Commit 1c9a9082 authored by Vitaly Prosyak's avatar Vitaly Prosyak Committed by Alex Deucher
Browse files

amd/powerplay: Fix get dal power level 



Simplify data struct for get dal power level

Signed-off-by: default avatarVitaly Prosyak <vitaly.prosyak@amd.com>
parent c4dd206b

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

+3 −3
Original line number Diff line number Diff line
@@ -620,7 +620,8 @@ int amd_powerplay_display_configuration_change(void *handle, const void *input) 
	return 0;

}



int amd_powerplay_get_display_power_level(void *handle,  void *output)

int amd_powerplay_get_display_power_level(void *handle,

		struct amd_pp_dal_clock_info *output)

{

	struct pp_hwmgr  *hwmgr;
@@ -629,6 +630,5 @@ int amd_powerplay_get_display_power_level(void *handle, void *output) 


	hwmgr = ((struct pp_instance *)handle)->hwmgr;



	return phm_get_dal_power_level(hwmgr,

			(struct pp_dal_clock_info *)output);

	return phm_get_dal_power_level(hwmgr, output);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -1597,7 +1597,7 @@ static void cz_hw_print_display_cfg( 
}



 static int cz_get_dal_power_level(struct pp_hwmgr *hwmgr,

		struct pp_dal_clock_info*info)

		struct amd_pp_dal_clock_info*info)

{

	uint32_t i;

	const struct phm_clock_voltage_dependency_table * table =

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

+4 −3
Original line number Diff line number Diff line
@@ -262,9 +262,10 @@ int phm_store_dal_configuration_data(struct pp_hwmgr *hwmgr, 
}



int phm_get_dal_power_level(struct pp_hwmgr *hwmgr,

		struct pp_dal_clock_info*info)

		struct amd_pp_dal_clock_info*info)

{

	if (hwmgr == NULL || hwmgr->hwmgr_func->get_dal_power_level == NULL)

	if (info == NULL || hwmgr == NULL ||

			hwmgr->hwmgr_func->get_dal_power_level == NULL)

		return -EINVAL;



	return hwmgr->hwmgr_func->get_dal_power_level(hwmgr, info);

drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h

+2 −1
Original line number Diff line number Diff line
@@ -218,7 +218,8 @@ int amd_powerplay_fini(void *handle); 


int amd_powerplay_display_configuration_change(void *handle, const void *input);



int amd_powerplay_get_display_power_level(void *handle,  void *output);

int amd_powerplay_get_display_power_level(void *handle,

		struct amd_pp_dal_clock_info *output);





#endif /* _AMD_POWERPLAY_H_ */

drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h

+1 −6
Original line number Diff line number Diff line
@@ -340,11 +340,6 @@ enum PP_DAL_POWERLEVEL { 
	PP_DAL_POWERLEVEL_7 = PP_DAL_POWERLEVEL_6+1,

};



struct pp_dal_clock_info {

	uint32_t		engine_max_clock;/*dal validation clock on AC*/

	uint32_t		memory_max_clock;/*dal validation clock on AC*/

	enum PP_DAL_POWERLEVEL	level;	/*number of levels for the given clocks*/

};



extern int phm_enable_clock_power_gatings(struct pp_hwmgr *hwmgr);

extern int phm_powergate_uvd(struct pp_hwmgr *hwmgr, bool gate);
@@ -380,7 +375,7 @@ extern int phm_store_dal_configuration_data(struct pp_hwmgr *hwmgr, 
		const struct amd_pp_display_configuration *display_config);



extern int phm_get_dal_power_level(struct pp_hwmgr *hwmgr,

		struct pp_dal_clock_info*info);

		struct amd_pp_dal_clock_info*info);



extern int phm_set_cpu_power_state(struct pp_hwmgr *hwmgr);