aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorRex Zhu <Rex.Zhu@amd.com>2016-12-29 02:30:38 -0500
committerAlex Deucher <alexander.deucher@amd.com>2017-01-27 11:13:02 -0500
commita5b580e1193e057a7ee82eae376cbb8c5c3c2518 (patch)
treeecf1c20eeac28ac8815e0ccddab078fc326ce738 /drivers/gpu
parent63b55943b3e1536da09c7d46396fd1f9a0ee8058 (diff)
drm/amd/powerplay: change function name to make code more readable
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c2
-rw-r--r--drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.h1
-rw-r--r--drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c6
-rw-r--r--drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c2
-rw-r--r--drivers/gpu/drm/amd/powerplay/inc/hwmgr.h2
5 files changed, 6 insertions, 7 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c
index 2f0638c6d41f..c15af0b6797c 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c
@@ -1945,7 +1945,7 @@ static const struct pp_hwmgr_func cz_hwmgr_funcs = {
1945 .read_sensor = cz_read_sensor, 1945 .read_sensor = cz_read_sensor,
1946}; 1946};
1947 1947
1948int cz_hwmgr_init(struct pp_hwmgr *hwmgr) 1948int cz_init_function_pointers(struct pp_hwmgr *hwmgr)
1949{ 1949{
1950 hwmgr->hwmgr_func = &cz_hwmgr_funcs; 1950 hwmgr->hwmgr_func = &cz_hwmgr_funcs;
1951 hwmgr->pptable_func = &pptable_funcs; 1951 hwmgr->pptable_func = &pptable_funcs;
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.h b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.h
index c477f1cf3f23..508b422d6159 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.h
@@ -316,7 +316,6 @@ struct cz_hwmgr {
316 316
317struct pp_hwmgr; 317struct pp_hwmgr;
318 318
319int cz_hwmgr_init(struct pp_hwmgr *hwmgr);
320int cz_dpm_powerdown_uvd(struct pp_hwmgr *hwmgr); 319int cz_dpm_powerdown_uvd(struct pp_hwmgr *hwmgr);
321int cz_dpm_powerup_uvd(struct pp_hwmgr *hwmgr); 320int cz_dpm_powerup_uvd(struct pp_hwmgr *hwmgr);
322int cz_dpm_powerdown_vce(struct pp_hwmgr *hwmgr); 321int cz_dpm_powerdown_vce(struct pp_hwmgr *hwmgr);
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
index b9d7451a4908..2f6225e84867 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
@@ -36,7 +36,7 @@
36#include "pp_acpi.h" 36#include "pp_acpi.h"
37#include "amd_acpi.h" 37#include "amd_acpi.h"
38 38
39extern int cz_hwmgr_init(struct pp_hwmgr *hwmgr); 39extern int cz_init_function_pointers(struct pp_hwmgr *hwmgr);
40 40
41static int polaris_set_asic_special_caps(struct pp_hwmgr *hwmgr); 41static int polaris_set_asic_special_caps(struct pp_hwmgr *hwmgr);
42static void hwmgr_init_default_caps(struct pp_hwmgr *hwmgr); 42static void hwmgr_init_default_caps(struct pp_hwmgr *hwmgr);
@@ -76,7 +76,7 @@ int hwmgr_early_init(struct pp_instance *handle)
76 76
77 switch (hwmgr->chip_family) { 77 switch (hwmgr->chip_family) {
78 case AMDGPU_FAMILY_CZ: 78 case AMDGPU_FAMILY_CZ:
79 cz_hwmgr_init(hwmgr); 79 cz_init_function_pointers(hwmgr);
80 break; 80 break;
81 case AMDGPU_FAMILY_VI: 81 case AMDGPU_FAMILY_VI:
82 switch (hwmgr->chip_id) { 82 switch (hwmgr->chip_id) {
@@ -104,7 +104,7 @@ int hwmgr_early_init(struct pp_instance *handle)
104 default: 104 default:
105 return -EINVAL; 105 return -EINVAL;
106 } 106 }
107 smu7_hwmgr_init(hwmgr); 107 smu7_init_function_pointers(hwmgr);
108 break; 108 break;
109 default: 109 default:
110 return -EINVAL; 110 return -EINVAL;
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
index e0eef49ce6ef..a54f6306182a 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
@@ -4437,7 +4437,7 @@ uint8_t smu7_get_sleep_divider_id_from_clock(uint32_t clock,
4437 return i; 4437 return i;
4438} 4438}
4439 4439
4440int smu7_hwmgr_init(struct pp_hwmgr *hwmgr) 4440int smu7_init_function_pointers(struct pp_hwmgr *hwmgr)
4441{ 4441{
4442 int ret = 0; 4442 int ret = 0;
4443 4443
diff --git a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
index c50e840ca17d..27217a7ae039 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
@@ -688,7 +688,7 @@ extern int phm_initializa_dynamic_state_adjustment_rule_settings(struct pp_hwmgr
688extern uint32_t phm_get_lowest_enabled_level(struct pp_hwmgr *hwmgr, uint32_t mask); 688extern uint32_t phm_get_lowest_enabled_level(struct pp_hwmgr *hwmgr, uint32_t mask);
689extern void phm_apply_dal_min_voltage_request(struct pp_hwmgr *hwmgr); 689extern void phm_apply_dal_min_voltage_request(struct pp_hwmgr *hwmgr);
690 690
691extern int smu7_hwmgr_init(struct pp_hwmgr *hwmgr); 691extern int smu7_init_function_pointers(struct pp_hwmgr *hwmgr);
692extern int phm_get_voltage_evv_on_sclk(struct pp_hwmgr *hwmgr, uint8_t voltage_type, 692extern int phm_get_voltage_evv_on_sclk(struct pp_hwmgr *hwmgr, uint8_t voltage_type,
693 uint32_t sclk, uint16_t id, uint16_t *voltage); 693 uint32_t sclk, uint16_t id, uint16_t *voltage);
694 694