[PATCH 1/2] Revert "drm/amdgpu: add sysfs interface to set arbitrary sclk value for navi14"

[Deucher, Alexander]

[AMD Public Use]

Please also revert this fix:
https://cgit.freedesktop.org/~agd5f/linux/commit/?h=amd-staging-drm-next&id=4e261b86437af7481364a5239c62cc3c5ef0ee38

Alex
________________________________
From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> on behalf of Quan, Evan <Evan.Quan at amd.com>
Sent: Thursday, February 27, 2020 10:37 PM
To: Gui, Jack <Jack.Gui at amd.com>; amd-gfx at lists.freedesktop.org <amd-gfx at lists.freedesktop.org>
Cc: Xu, Feifei <Feifei.Xu at amd.com>; Feng, Kenneth <Kenneth.Feng at amd.com>; Gui, Jack <Jack.Gui at amd.com>
Subject: RE: [PATCH 1/2] Revert "drm/amdgpu: add sysfs interface to set arbitrary sclk value for navi14"

Reviewed-by: Evan Quan <evan.quan at amd.com>

-----Original Message-----
From: Chengming Gui <Jack.Gui at amd.com>
Sent: Friday, February 28, 2020 10:37 AM
To: amd-gfx at lists.freedesktop.org
Cc: Quan, Evan <Evan.Quan at amd.com>; Feng, Kenneth <Kenneth.Feng at amd.com>; Xu, Feifei <Feifei.Xu at amd.com>; Gui, Jack <Jack.Gui at amd.com>
Subject: [PATCH 1/2] Revert "drm/amdgpu: add sysfs interface to set arbitrary sclk value for navi14"

Revert this commit and than add debugfs interface to replace this to meet the specitic requirement.

This reverts commit 3107269204f8e18f389080673f7848b420970aa5.
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c    | 42 -------------------------------
 drivers/gpu/drm/amd/powerplay/smu_v11_0.c |  9 ++-----
 2 files changed, 2 insertions(+), 49 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index 9deff8c..bc3cf04 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -1034,40 +1034,6 @@ static ssize_t amdgpu_read_mask(const char *buf, size_t count, uint32_t *mask)
         return 0;
 }

-static ssize_t amdgpu_set_pp_sclk(struct device *dev,
-               struct device_attribute *attr,
-               const char *buf,
-               size_t count)
-{
-       struct drm_device *ddev = dev_get_drvdata(dev);
-       struct amdgpu_device *adev = ddev->dev_private;
-       int ret;
-       uint32_t value;
-
-       if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))
-               return -EINVAL;
-
-       ret = pm_runtime_get_sync(ddev->dev);
-       if (ret < 0)
-               return ret;
-
-       ret = kstrtou32(buf, 0, &value);
-       if (ret < 0)
-               return ret;
-       if (is_support_sw_smu(adev))
-               ret = smu_set_soft_freq_range(&adev->smu, SMU_SCLK, value, value);
-       else
-               return 0;
-
-       pm_runtime_mark_last_busy(ddev->dev);
-       pm_runtime_put_autosuspend(ddev->dev);
-
-       if (ret)
-               return -EINVAL;
-
-       return count;
-}
-
 static ssize_t amdgpu_set_pp_dpm_sclk(struct device *dev,
                 struct device_attribute *attr,
                 const char *buf,
@@ -1829,8 +1795,6 @@ static DEVICE_ATTR(pp_force_state, S_IRUGO | S_IWUSR,  static DEVICE_ATTR(pp_table, S_IRUGO | S_IWUSR,
                 amdgpu_get_pp_table,
                 amdgpu_set_pp_table);
-static DEVICE_ATTR(pp_sclk, S_IWUSR,
-               NULL, amdgpu_set_pp_sclk);
 static DEVICE_ATTR(pp_dpm_sclk, S_IRUGO | S_IWUSR,
                 amdgpu_get_pp_dpm_sclk,
                 amdgpu_set_pp_dpm_sclk);
@@ -3322,12 +3286,6 @@ int amdgpu_pm_sysfs_init(struct amdgpu_device *adev)
                 return ret;
         }

-       ret = device_create_file(adev->dev, &dev_attr_pp_sclk);
-       if (ret) {
-               DRM_ERROR("failed to create device file pp_sclk\n");
-               return ret;
-       }
-
         ret = device_create_file(adev->dev, &dev_attr_pp_dpm_sclk);
         if (ret) {
                 DRM_ERROR("failed to create device file pp_dpm_sclk\n"); diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
index 1507bb7..c9e5ce1 100644
--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
+++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
@@ -1803,17 +1803,12 @@ int smu_v11_0_set_soft_freq_limited_range(struct smu_context *smu, enum smu_clk_  {
         int ret = 0, clk_id = 0;
         uint32_t param;
-       uint32_t min_freq, max_freq;

         clk_id = smu_clk_get_index(smu, clk_type);
         if (clk_id < 0)
                 return clk_id;

-       ret = smu_get_dpm_freq_range(smu, clk_type, &min_freq, &max_freq, true);
-       if (ret)
-               return ret;
-
-       if (max > 0 && max <=  max_freq) {
+       if (max > 0) {
                 param = (uint32_t)((clk_id << 16) | (max & 0xffff));
                 ret = smu_send_smc_msg_with_param(smu, SMU_MSG_SetSoftMaxByFreq,
                                                   param);
@@ -1821,7 +1816,7 @@ int smu_v11_0_set_soft_freq_limited_range(struct smu_context *smu, enum smu_clk_
                         return ret;
         }

-       if (min > 0 && min >= min_freq) {
+       if (min > 0) {
                 param = (uint32_t)((clk_id << 16) | (min & 0xffff));
                 ret = smu_send_smc_msg_with_param(smu, SMU_MSG_SetSoftMinByFreq,
                                                   param);
--
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx at lists.freedesktop.org
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Calexander.deucher%40amd.com%7C86a8aed9b2854f38626908d7bbff8780%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637184578512568577&sdata=O1zVjtLbL6JRjrWzN23MARS6NlM8kUjLd3%2BKuxQOVbI%3D&reserved=0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20200228/2e9b4b4e/attachment-0001.htm>