drm/amd/powerplay: simplify the interface of get_gpu_power

[linux.git] / drivers / gpu / drm / amd / powerplay / navi10_ppt.c

diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
index 376ea528964667b481b469f6247fd2f9b239a98a..f9bfcaa73f7e5a81fa9c4204efd37f8819bed5cb 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
@@ -1195,6 +1195,10 @@ static int navi10_read_sensor(struct smu_context *smu,
                ret = navi10_get_current_activity_percent(smu, (uint32_t *)data);
                *size = 4;
                break;
+       case AMDGPU_PP_SENSOR_GPU_POWER:
+               ret = navi10_get_gpu_power(smu, (uint32_t *)data);
+               *size = 4;
+               break;
        default:
                return -EINVAL;
        }
@@ -1227,7 +1231,6 @@ static const struct pptable_funcs navi10_ppt_funcs = {
        .notify_smc_dispaly_config = navi10_notify_smc_dispaly_config,
        .force_dpm_limit_value = navi10_force_dpm_limit_value,
        .unforce_dpm_levels = navi10_unforce_dpm_levels,
-       .get_gpu_power = navi10_get_gpu_power,
        .is_dpm_running = navi10_is_dpm_running,
        .set_thermal_fan_table = navi10_set_thermal_fan_table,
        .get_fan_speed_percent = navi10_get_fan_speed_percent,