From 155f1127ce6f1e2da6ee139b2869242a40b99814 Mon Sep 17 00:00:00 2001 From: David Rokhvarg Date: Mon, 14 Dec 2015 10:51:39 -0500 Subject: [PATCH] drm/amd/powerplay: Make declarations of functions exposed to DAL type-safe. Signed-off-by: David Rokhvarg Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 15 ++++++--------- drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 15 ++++++++++----- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c index fd56af6e92d4..9b7c2862c16e 100644 --- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c +++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c @@ -750,10 +750,10 @@ int amd_powerplay_fini(void *handle) /* export this function to DAL */ -int amd_powerplay_display_configuration_change(void *handle, const void *input) +int amd_powerplay_display_configuration_change(void *handle, + const struct amd_pp_display_configuration *display_config) { struct pp_hwmgr *hwmgr; - const struct amd_pp_display_configuration *display_config = input; PP_CHECK((struct pp_instance *)handle); @@ -780,14 +780,13 @@ int amd_powerplay_get_display_power_level(void *handle, } int amd_powerplay_get_current_clocks(void *handle, - void *output) + struct amd_pp_clock_info *clocks) { struct pp_hwmgr *hwmgr; struct amd_pp_simple_clock_info simple_clocks; struct pp_clock_info hw_clocks; - struct amd_pp_clock_info *clocks = (struct amd_pp_clock_info *)output; - if (handle == NULL || output == NULL) + if (handle == NULL || clocks == NULL) return -EINVAL; hwmgr = ((struct pp_instance *)handle)->hwmgr; @@ -839,12 +838,10 @@ int amd_powerplay_get_clock_by_type(void *handle, enum amd_pp_clock_type type, s return result; } -int amd_powerplay_get_display_mode_validation_clocks(void *handle, const void *input, - void *output) +int amd_powerplay_get_display_mode_validation_clocks(void *handle, + struct amd_pp_simple_clock_info *clocks) { int result = -1; - - struct amd_pp_simple_clock_info *clocks = output; struct pp_hwmgr *hwmgr; if (handle == NULL || clocks == NULL) diff --git a/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h b/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h index d0aeb14f6256..7255f7ddf93a 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h +++ b/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h @@ -349,18 +349,23 @@ struct amd_powerplay { int amd_powerplay_init(struct amd_pp_init *pp_init, struct amd_powerplay *amd_pp); + int amd_powerplay_fini(void *handle); -int amd_powerplay_display_configuration_change(void *handle, const void *input); +int amd_powerplay_display_configuration_change(void *handle, + const struct amd_pp_display_configuration *input); int amd_powerplay_get_display_power_level(void *handle, struct amd_pp_simple_clock_info *output); -int amd_powerplay_get_current_clocks(void *handle, void *output); +int amd_powerplay_get_current_clocks(void *handle, + struct amd_pp_clock_info *output); -int amd_powerplay_get_clock_by_type(void *handle, enum amd_pp_clock_type type, struct amd_pp_clocks *clocks); +int amd_powerplay_get_clock_by_type(void *handle, + enum amd_pp_clock_type type, + struct amd_pp_clocks *clocks); -int amd_powerplay_get_display_mode_validation_clocks(void *handle, const void *input, - void *output); +int amd_powerplay_get_display_mode_validation_clocks(void *handle, + struct amd_pp_simple_clock_info *output); #endif /* _AMD_POWERPLAY_H_ */ -- 2.39.5