diff options
author | Kevin Wang <kevin1.wang@amd.com> | 2019-04-18 03:06:34 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2019-06-21 19:59:29 -0400 |
commit | b1e7e224192fb5d9f8534c35fe14fb5bf30cb08e (patch) | |
tree | 86bfcb8e46553486b177380efa81df8a122a1651 /drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | |
parent | 3ac54a50438053b1f4d3480c608eda50ae25775c (diff) |
drm/amd/powerplay: add function print_clk_levels for navi10
add sysfs interface of print_clk_levels sysfs for navi10.
Signed-off-by: Kevin Wang <kevin1.wang@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c index 9f4ed75ade2f..6f33b9678457 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | |||
@@ -726,10 +726,10 @@ static ssize_t amdgpu_get_pp_od_clk_voltage(struct device *dev, | |||
726 | uint32_t size = 0; | 726 | uint32_t size = 0; |
727 | 727 | ||
728 | if (is_support_sw_smu(adev)) { | 728 | if (is_support_sw_smu(adev)) { |
729 | size = smu_print_clk_levels(&adev->smu, OD_SCLK, buf); | 729 | size = smu_print_clk_levels(&adev->smu, SMU_OD_SCLK, buf); |
730 | size += smu_print_clk_levels(&adev->smu, OD_MCLK, buf+size); | 730 | size += smu_print_clk_levels(&adev->smu, SMU_OD_MCLK, buf+size); |
731 | size += smu_print_clk_levels(&adev->smu, OD_VDDC_CURVE, buf+size); | 731 | size += smu_print_clk_levels(&adev->smu, SMU_OD_VDDC_CURVE, buf+size); |
732 | size += smu_print_clk_levels(&adev->smu, OD_RANGE, buf+size); | 732 | size += smu_print_clk_levels(&adev->smu, SMU_OD_RANGE, buf+size); |
733 | return size; | 733 | return size; |
734 | } else if (adev->powerplay.pp_funcs->print_clock_levels) { | 734 | } else if (adev->powerplay.pp_funcs->print_clock_levels) { |
735 | size = amdgpu_dpm_print_clock_levels(adev, OD_SCLK, buf); | 735 | size = amdgpu_dpm_print_clock_levels(adev, OD_SCLK, buf); |
@@ -840,7 +840,7 @@ static ssize_t amdgpu_get_pp_dpm_sclk(struct device *dev, | |||
840 | return adev->virt.ops->get_pp_clk(adev, PP_SCLK, buf); | 840 | return adev->virt.ops->get_pp_clk(adev, PP_SCLK, buf); |
841 | 841 | ||
842 | if (is_support_sw_smu(adev)) | 842 | if (is_support_sw_smu(adev)) |
843 | return smu_print_clk_levels(&adev->smu, PP_SCLK, buf); | 843 | return smu_print_clk_levels(&adev->smu, SMU_SCLK, buf); |
844 | else if (adev->powerplay.pp_funcs->print_clock_levels) | 844 | else if (adev->powerplay.pp_funcs->print_clock_levels) |
845 | return amdgpu_dpm_print_clock_levels(adev, PP_SCLK, buf); | 845 | return amdgpu_dpm_print_clock_levels(adev, PP_SCLK, buf); |
846 | else | 846 | else |
@@ -923,7 +923,7 @@ static ssize_t amdgpu_get_pp_dpm_mclk(struct device *dev, | |||
923 | return adev->virt.ops->get_pp_clk(adev, PP_MCLK, buf); | 923 | return adev->virt.ops->get_pp_clk(adev, PP_MCLK, buf); |
924 | 924 | ||
925 | if (is_support_sw_smu(adev)) | 925 | if (is_support_sw_smu(adev)) |
926 | return smu_print_clk_levels(&adev->smu, PP_MCLK, buf); | 926 | return smu_print_clk_levels(&adev->smu, SMU_MCLK, buf); |
927 | else if (adev->powerplay.pp_funcs->print_clock_levels) | 927 | else if (adev->powerplay.pp_funcs->print_clock_levels) |
928 | return amdgpu_dpm_print_clock_levels(adev, PP_MCLK, buf); | 928 | return amdgpu_dpm_print_clock_levels(adev, PP_MCLK, buf); |
929 | else | 929 | else |
@@ -966,7 +966,7 @@ static ssize_t amdgpu_get_pp_dpm_socclk(struct device *dev, | |||
966 | struct amdgpu_device *adev = ddev->dev_private; | 966 | struct amdgpu_device *adev = ddev->dev_private; |
967 | 967 | ||
968 | if (is_support_sw_smu(adev)) | 968 | if (is_support_sw_smu(adev)) |
969 | return smu_print_clk_levels(&adev->smu, PP_SOCCLK, buf); | 969 | return smu_print_clk_levels(&adev->smu, SMU_SOCCLK, buf); |
970 | else if (adev->powerplay.pp_funcs->print_clock_levels) | 970 | else if (adev->powerplay.pp_funcs->print_clock_levels) |
971 | return amdgpu_dpm_print_clock_levels(adev, PP_SOCCLK, buf); | 971 | return amdgpu_dpm_print_clock_levels(adev, PP_SOCCLK, buf); |
972 | else | 972 | else |
@@ -1006,7 +1006,7 @@ static ssize_t amdgpu_get_pp_dpm_fclk(struct device *dev, | |||
1006 | struct amdgpu_device *adev = ddev->dev_private; | 1006 | struct amdgpu_device *adev = ddev->dev_private; |
1007 | 1007 | ||
1008 | if (is_support_sw_smu(adev)) | 1008 | if (is_support_sw_smu(adev)) |
1009 | return smu_print_clk_levels(&adev->smu, PP_FCLK, buf); | 1009 | return smu_print_clk_levels(&adev->smu, SMU_FCLK, buf); |
1010 | else if (adev->powerplay.pp_funcs->print_clock_levels) | 1010 | else if (adev->powerplay.pp_funcs->print_clock_levels) |
1011 | return amdgpu_dpm_print_clock_levels(adev, PP_FCLK, buf); | 1011 | return amdgpu_dpm_print_clock_levels(adev, PP_FCLK, buf); |
1012 | else | 1012 | else |
@@ -1046,7 +1046,7 @@ static ssize_t amdgpu_get_pp_dpm_dcefclk(struct device *dev, | |||
1046 | struct amdgpu_device *adev = ddev->dev_private; | 1046 | struct amdgpu_device *adev = ddev->dev_private; |
1047 | 1047 | ||
1048 | if (is_support_sw_smu(adev)) | 1048 | if (is_support_sw_smu(adev)) |
1049 | return smu_print_clk_levels(&adev->smu, PP_DCEFCLK, buf); | 1049 | return smu_print_clk_levels(&adev->smu, SMU_DCEFCLK, buf); |
1050 | else if (adev->powerplay.pp_funcs->print_clock_levels) | 1050 | else if (adev->powerplay.pp_funcs->print_clock_levels) |
1051 | return amdgpu_dpm_print_clock_levels(adev, PP_DCEFCLK, buf); | 1051 | return amdgpu_dpm_print_clock_levels(adev, PP_DCEFCLK, buf); |
1052 | else | 1052 | else |
@@ -1086,7 +1086,7 @@ static ssize_t amdgpu_get_pp_dpm_pcie(struct device *dev, | |||
1086 | struct amdgpu_device *adev = ddev->dev_private; | 1086 | struct amdgpu_device *adev = ddev->dev_private; |
1087 | 1087 | ||
1088 | if (is_support_sw_smu(adev)) | 1088 | if (is_support_sw_smu(adev)) |
1089 | return smu_print_clk_levels(&adev->smu, PP_PCIE, buf); | 1089 | return smu_print_clk_levels(&adev->smu, SMU_PCIE, buf); |
1090 | else if (adev->powerplay.pp_funcs->print_clock_levels) | 1090 | else if (adev->powerplay.pp_funcs->print_clock_levels) |
1091 | return amdgpu_dpm_print_clock_levels(adev, PP_PCIE, buf); | 1091 | return amdgpu_dpm_print_clock_levels(adev, PP_PCIE, buf); |
1092 | else | 1092 | else |
@@ -1127,7 +1127,7 @@ static ssize_t amdgpu_get_pp_sclk_od(struct device *dev, | |||
1127 | uint32_t value = 0; | 1127 | uint32_t value = 0; |
1128 | 1128 | ||
1129 | if (is_support_sw_smu(adev)) | 1129 | if (is_support_sw_smu(adev)) |
1130 | value = smu_get_od_percentage(&(adev->smu), OD_SCLK); | 1130 | value = smu_get_od_percentage(&(adev->smu), SMU_OD_SCLK); |
1131 | else if (adev->powerplay.pp_funcs->get_sclk_od) | 1131 | else if (adev->powerplay.pp_funcs->get_sclk_od) |
1132 | value = amdgpu_dpm_get_sclk_od(adev); | 1132 | value = amdgpu_dpm_get_sclk_od(adev); |
1133 | 1133 | ||
@@ -1178,7 +1178,7 @@ static ssize_t amdgpu_get_pp_mclk_od(struct device *dev, | |||
1178 | uint32_t value = 0; | 1178 | uint32_t value = 0; |
1179 | 1179 | ||
1180 | if (is_support_sw_smu(adev)) | 1180 | if (is_support_sw_smu(adev)) |
1181 | value = smu_get_od_percentage(&(adev->smu), OD_MCLK); | 1181 | value = smu_get_od_percentage(&(adev->smu), SMU_OD_MCLK); |
1182 | else if (adev->powerplay.pp_funcs->get_mclk_od) | 1182 | else if (adev->powerplay.pp_funcs->get_mclk_od) |
1183 | value = amdgpu_dpm_get_mclk_od(adev); | 1183 | value = amdgpu_dpm_get_mclk_od(adev); |
1184 | 1184 | ||