diff options
author | Kevin Wang <Kevin1.Wang@amd.com> | 2019-01-17 00:15:48 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2019-03-19 16:03:58 -0400 |
commit | 0989532330e1e7d25693c14b3d57288aa4915f81 (patch) | |
tree | 34002bb1560b8bcea5af25b91d130970b59d6d4c /drivers/gpu | |
parent | 143c75d6514dd65ba49d3846a5a02c45a4b7f15b (diff) |
drm/amd/powerplay: implement sysfs of get num states function
add function smu_get_power_num_state function for sw-smu.
it's only for sysfs interface, the power state feature is not ready for sw-smu.
Signed-off-by: Kevin Wang <Kevin1.Wang@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Acked-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/amdgpu/amdgpu_pm.c | 8 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 13 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 1 |
3 files changed, 20 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c index 53b470c30da4..5eda007ea632 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | |||
@@ -350,9 +350,13 @@ static ssize_t amdgpu_get_pp_num_states(struct device *dev, | |||
350 | struct drm_device *ddev = dev_get_drvdata(dev); | 350 | struct drm_device *ddev = dev_get_drvdata(dev); |
351 | struct amdgpu_device *adev = ddev->dev_private; | 351 | struct amdgpu_device *adev = ddev->dev_private; |
352 | struct pp_states_info data; | 352 | struct pp_states_info data; |
353 | int i, buf_len; | 353 | int i, buf_len, ret; |
354 | 354 | ||
355 | if (adev->powerplay.pp_funcs->get_pp_num_states) | 355 | if (is_support_sw_smu(adev)) { |
356 | ret = smu_get_power_num_states(&adev->smu, &data); | ||
357 | if (ret) | ||
358 | return ret; | ||
359 | } else if (adev->powerplay.pp_funcs->get_pp_num_states) | ||
356 | amdgpu_dpm_get_pp_num_states(adev, &data); | 360 | amdgpu_dpm_get_pp_num_states(adev, &data); |
357 | 361 | ||
358 | buf_len = snprintf(buf, PAGE_SIZE, "states: %d\n", data.nums); | 362 | buf_len = snprintf(buf, PAGE_SIZE, "states: %d\n", data.nums); |
diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c index 012d2790da8a..b4d6046d5f23 100644 --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | |||
@@ -29,6 +29,19 @@ | |||
29 | #include "smu_v11_0.h" | 29 | #include "smu_v11_0.h" |
30 | #include "atom.h" | 30 | #include "atom.h" |
31 | 31 | ||
32 | int smu_get_power_num_states(struct smu_context *smu, | ||
33 | struct pp_states_info *state_info) | ||
34 | { | ||
35 | if (!state_info) | ||
36 | return -EINVAL; | ||
37 | |||
38 | /* not support power state */ | ||
39 | memset(state_info, 0, sizeof(struct pp_states_info)); | ||
40 | state_info->nums = 0; | ||
41 | |||
42 | return 0; | ||
43 | } | ||
44 | |||
32 | int smu_common_read_sensor(struct smu_context *smu, enum amd_pp_sensors sensor, | 45 | int smu_common_read_sensor(struct smu_context *smu, enum amd_pp_sensors sensor, |
33 | void *data, uint32_t *size) | 46 | void *data, uint32_t *size) |
34 | { | 47 | { |
diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h index 2e89a59ed06c..4498059f5e05 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | |||
@@ -381,5 +381,6 @@ int smu_common_read_sensor(struct smu_context *smu, enum amd_pp_sensors sensor, | |||
381 | void *data, uint32_t *size); | 381 | void *data, uint32_t *size); |
382 | int smu_sys_get_pp_table(struct smu_context *smu, void **table); | 382 | int smu_sys_get_pp_table(struct smu_context *smu, void **table); |
383 | int smu_sys_set_pp_table(struct smu_context *smu, void *buf, size_t size); | 383 | int smu_sys_set_pp_table(struct smu_context *smu, void *buf, size_t size); |
384 | int smu_get_power_num_states(struct smu_context *smu, struct pp_states_info *state_info); | ||
384 | 385 | ||
385 | #endif | 386 | #endif |