From 1c9a90820beb63f75ac7dabf75533f425aadc3fa Mon Sep 17 00:00:00 2001 From: Vitaly Prosyak Date: Thu, 3 Dec 2015 10:27:57 -0500 Subject: amd/powerplay: Fix get dal power level Simplify data struct for get dal power level Signed-off-by: Vitaly Prosyak --- drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/drm/amd/powerplay/hwmgr') diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c index a745acf9c181..bd30b56b1706 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c @@ -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 = diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c index d24a41964fbe..881feb87fc8b 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c @@ -262,12 +262,13 @@ 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); + return hwmgr->hwmgr_func->get_dal_power_level(hwmgr, info); } int phm_set_cpu_power_state(struct pp_hwmgr *hwmgr) -- cgit v1.2.3