diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/1477-drm-amd-powerplay-add-fan-input-interface-for-hwmon.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/1477-drm-amd-powerplay-add-fan-input-interface-for-hwmon.patch | 109 |
1 files changed, 109 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/1477-drm-amd-powerplay-add-fan-input-interface-for-hwmon.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/1477-drm-amd-powerplay-add-fan-input-interface-for-hwmon.patch new file mode 100644 index 00000000..a7c3894b --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/1477-drm-amd-powerplay-add-fan-input-interface-for-hwmon.patch @@ -0,0 +1,109 @@ +From 87e58c3fe984cba183605c37915ab70337c9dc37 Mon Sep 17 00:00:00 2001 +From: Likun Gao <Likun.Gao@amd.com> +Date: Fri, 25 Jan 2019 17:45:24 +0800 +Subject: [PATCH 1477/2940] drm/amd/powerplay: add fan input interface for + hwmon + +Add fan1_input and fan1_target interface to get fan speed info for hwmon. + +Signed-off-by: Likun Gao <Likun.Gao@amd.com> +Reviewed-by: Kevin Wang <kevin1.wang@amd.com> +Reviewed-by: Huang Rui <ray.huang@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 12 ++++++++++-- + .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 3 +++ + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 19 ++++++++++++++++++- + 3 files changed, 31 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +index ccdb0f6f1ff9..d140b3dce676 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +@@ -1503,7 +1503,11 @@ static ssize_t amdgpu_hwmon_get_fan1_input(struct device *dev, + (adev->ddev->switch_power_state != DRM_SWITCH_POWER_ON)) + return -EINVAL; + +- if (adev->powerplay.pp_funcs->get_fan_speed_rpm) { ++ if (is_support_sw_smu(adev)) { ++ err = smu_get_current_rpm(&adev->smu, &speed); ++ if (err) ++ return err; ++ } else if (adev->powerplay.pp_funcs->get_fan_speed_rpm) { + err = amdgpu_dpm_get_fan_speed_rpm(adev, &speed); + if (err) + return err; +@@ -1559,7 +1563,11 @@ static ssize_t amdgpu_hwmon_get_fan1_target(struct device *dev, + (adev->ddev->switch_power_state != DRM_SWITCH_POWER_ON)) + return -EINVAL; + +- if (adev->powerplay.pp_funcs->get_fan_speed_rpm) { ++ if (is_support_sw_smu(adev)) { ++ err = smu_get_current_rpm(&adev->smu, &rpm); ++ if (err) ++ return err; ++ } else if (adev->powerplay.pp_funcs->get_fan_speed_rpm) { + err = amdgpu_dpm_get_fan_speed_rpm(adev, &rpm); + if (err) + return err; +diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +index d7f26e178839..2cc7129b53aa 100644 +--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h ++++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +@@ -530,6 +530,7 @@ struct smu_funcs + int (*dpm_set_vce_enable)(struct smu_context *smu, bool enable); + uint32_t (*get_sclk)(struct smu_context *smu, bool low); + uint32_t (*get_mclk)(struct smu_context *smu, bool low); ++ int (*get_current_rpm)(struct smu_context *smu, uint32_t *speed); + }; + + #define smu_init_microcode(smu) \ +@@ -580,6 +581,8 @@ struct smu_funcs + ((smu)->funcs->set_od8_default_settings ? (smu)->funcs->set_od8_default_settings((smu)) : 0) + #define smu_update_od8_settings(smu, index, value) \ + ((smu)->funcs->update_od8_settings ? (smu)->funcs->update_od8_settings((smu), (index), (value)) : 0) ++#define smu_get_current_rpm(smu, speed) \ ++ ((smu)->funcs->get_current_rpm ? (smu)->funcs->get_current_rpm((smu), (speed)) : 0) + #define smu_send_smc_msg(smu, msg) \ + ((smu)->funcs->send_smc_msg? (smu)->funcs->send_smc_msg((smu), (msg)) : 0) + #define smu_send_smc_msg_with_param(smu, msg, param) \ +diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c +index 8d2531845fd8..6333c185385c 100644 +--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c ++++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c +@@ -1712,6 +1712,23 @@ static int smu_v11_0_dpm_set_vce_enable(struct smu_context *smu, bool enable) + return smu_feature_set_enabled(smu, FEATURE_DPM_UVD_BIT, enable); + } + ++static int smu_v11_0_get_current_rpm(struct smu_context *smu, ++ uint32_t *current_rpm) ++{ ++ int ret; ++ ++ ret = smu_send_smc_msg(smu, SMU_MSG_GetCurrentRpm); ++ ++ if (ret) { ++ pr_err("Attempt to get current RPM from SMC Failed!\n"); ++ return ret; ++ } ++ ++ smu_read_smc_arg(smu, current_rpm); ++ ++ return 0; ++} ++ + static const struct smu_funcs smu_v11_0_funcs = { + .init_microcode = smu_v11_0_init_microcode, + .load_microcode = smu_v11_0_load_microcode, +@@ -1761,7 +1778,7 @@ static const struct smu_funcs smu_v11_0_funcs = { + .update_od8_settings = smu_v11_0_update_od8_settings, + .dpm_set_uvd_enable = smu_v11_0_dpm_set_uvd_enable, + .dpm_set_vce_enable = smu_v11_0_dpm_set_vce_enable, +- ++ .get_current_rpm = smu_v11_0_get_current_rpm, + }; + + void smu_v11_0_set_smu_funcs(struct smu_context *smu) +-- +2.17.1 + |