diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/1418-drm-amd-powerplay-implement-sysfs-of-pp_cur_state-fu.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/1418-drm-amd-powerplay-implement-sysfs-of-pp_cur_state-fu.patch | 93 |
1 files changed, 93 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/1418-drm-amd-powerplay-implement-sysfs-of-pp_cur_state-fu.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/1418-drm-amd-powerplay-implement-sysfs-of-pp_cur_state-fu.patch new file mode 100644 index 00000000..45537c70 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/1418-drm-amd-powerplay-implement-sysfs-of-pp_cur_state-fu.patch @@ -0,0 +1,93 @@ +From 5d44d82d1bd76a4b730766806b734b47ffc68383 Mon Sep 17 00:00:00 2001 +From: Kevin Wang <Kevin1.Wang@amd.com> +Date: Thu, 17 Jan 2019 13:29:06 +0800 +Subject: [PATCH 1418/2940] drm/amd/powerplay: implement sysfs of pp_cur_state + function + +add function of smu_get_currente_state for sw-smu. + +v2: fix code typo error if (ret); + +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> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 24 ++++++++++++------- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 6 +++++ + .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 1 + + 3 files changed, 22 insertions(+), 9 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +index 5eda007ea632..569f7be61b53 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +@@ -377,23 +377,29 @@ static ssize_t amdgpu_get_pp_cur_state(struct device *dev, + struct drm_device *ddev = dev_get_drvdata(dev); + struct amdgpu_device *adev = ddev->dev_private; + struct pp_states_info data; ++ struct smu_context *smu = &adev->smu; + enum amd_pm_state_type pm = 0; +- int i = 0; ++ int i = 0, ret = 0; + +- if (adev->powerplay.pp_funcs->get_current_power_state ++ if (is_support_sw_smu(adev)) { ++ pm = smu_get_current_power_state(smu); ++ ret = smu_get_power_num_states(smu, &data); ++ if (ret) ++ return ret; ++ } else if (adev->powerplay.pp_funcs->get_current_power_state + && adev->powerplay.pp_funcs->get_pp_num_states) { + pm = amdgpu_dpm_get_current_power_state(adev); + amdgpu_dpm_get_pp_num_states(adev, &data); ++ } + +- for (i = 0; i < data.nums; i++) { +- if (pm == data.states[i]) +- break; +- } +- +- if (i == data.nums) +- i = -EINVAL; ++ for (i = 0; i < data.nums; i++) { ++ if (pm == data.states[i]) ++ break; + } + ++ if (i == data.nums) ++ i = -EINVAL; ++ + return snprintf(buf, PAGE_SIZE, "%d\n", i); + } + +diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +index b4d6046d5f23..dc431f2eebe1 100644 +--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c ++++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +@@ -29,6 +29,12 @@ + #include "smu_v11_0.h" + #include "atom.h" + ++enum amd_pm_state_type smu_get_current_power_state(struct smu_context *smu) ++{ ++ /* not support power state */ ++ return POWER_STATE_TYPE_DEFAULT; ++} ++ + int smu_get_power_num_states(struct smu_context *smu, + struct pp_states_info *state_info) + { +diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +index 4498059f5e05..085575c1dadf 100644 +--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h ++++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +@@ -382,5 +382,6 @@ int smu_common_read_sensor(struct smu_context *smu, enum amd_pp_sensors sensor, + int smu_sys_get_pp_table(struct smu_context *smu, void **table); + int smu_sys_set_pp_table(struct smu_context *smu, void *buf, size_t size); + int smu_get_power_num_states(struct smu_context *smu, struct pp_states_info *state_info); ++enum amd_pm_state_type smu_get_current_power_state(struct smu_context *smu); + + #endif +-- +2.17.1 + |