<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=Windows-1252">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<a id="OWAAM237161" class="_1OtrSZdhKXVv3UhaivrdJ4 mention ms-bgc-nlr ms-fcl-b" href="mailto:Alexander.Deucher@amd.com">@Deucher, Alexander</a></div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Hi Alex,</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
it seems not application will use this sysfs, can we rename it from "ppfeatures" to "pp_features"?</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<span style="color: rgb(0, 0, 0); font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt;">this patch sets is pending.</span><br>
</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Best Regards,</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Kevin</div>
<div id="appendonsend"></div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> StDenis, Tom <Tom.StDenis@amd.com><br>
<b>Sent:</b> Thursday, July 25, 2019 9:14 PM<br>
<b>To:</b> Deucher, Alexander <Alexander.Deucher@amd.com>; Huang, Ray <Ray.Huang@amd.com>; Wang, Kevin(Yang) <Kevin1.Wang@amd.com>; Quan, Evan <Evan.Quan@amd.com>; amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>; Zhang, Hawking <Hawking.Zhang@amd.com><br>
<b>Cc:</b> Feng, Kenneth <Kenneth.Feng@amd.com><br>
<b>Subject:</b> Re: [PATCH 5/5] drm/amd/powerplay: implment sysfs feature status function in smu</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">No it doesn't.  We get clocks for --top from the sensors interface.<br>
<br>
<br>
On 2019-07-25 9:01 a.m., Deucher, Alexander wrote:<br>
> Tom, does umr use it?<br>
><br>
> Alex<br>
> ------------------------------------------------------------------------<br>
> *From:* Huang, Ray <Ray.Huang@amd.com><br>
> *Sent:* Thursday, July 25, 2019 4:49 AM<br>
> *To:* Wang, Kevin(Yang) <Kevin1.Wang@amd.com>; Quan, Evan <br>
> <Evan.Quan@amd.com>; amd-gfx@lists.freedesktop.org <br>
> <amd-gfx@lists.freedesktop.org>; Zhang, Hawking <br>
> <Hawking.Zhang@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com><br>
> *Cc:* Feng, Kenneth <Kenneth.Feng@amd.com><br>
> *Subject:* RE: [PATCH 5/5] drm/amd/powerplay: implment sysfs feature <br>
> status function in smu<br>
><br>
> Any other user mode tool use the “ppfeature” sysfs interface?<br>
><br>
> Thanks,<br>
><br>
> Ray<br>
><br>
> *From:* Wang, Kevin(Yang) <Kevin1.Wang@amd.com><br>
> *Sent:* Thursday, July 25, 2019 4:44 PM<br>
> *To:* Quan, Evan <Evan.Quan@amd.com>; amd-gfx@lists.freedesktop.org; <br>
> Zhang, Hawking <Hawking.Zhang@amd.com>; Deucher, Alexander <br>
> <Alexander.Deucher@amd.com><br>
> *Cc:* Huang, Ray <Ray.Huang@amd.com>; Feng, Kenneth <Kenneth.Feng@amd.com><br>
> *Subject:* Re: [PATCH 5/5] drm/amd/powerplay: implment sysfs feature <br>
> status function in smu<br>
><br>
> in fact, i don't want to change this sysfs name from "ppfeatures" to <br>
> "pp_features",<br>
><br>
> but it seems that don't have same name format with other pp sysfs node.<br>
><br>
> the other powerplay sysfs name have "pp_" prefix, i think we'd better <br>
> to change it name to "pp_features"<br>
><br>
> eg:<br>
><br>
> pp_cur_state    pp_dpm_fclk  pp_dpm_pcie  pp_dpm_socclk <br>
>  pp_force_state  pp_num_states  pp_sclk_od<br>
> pp_dpm_dcefclk  pp_dpm_mclk  pp_dpm_sclk  pp_features    pp_mclk_od   <br>
>    pp_power_profile_mode  pp_table<br>
><br>
> @Deucher, Alexander <<a href="mailto:Alexander.Deucher@amd.com">mailto:Alexander.Deucher@amd.com</a>> @Zhang, Hawking
<br>
> <<a href="mailto:Hawking.Zhang@amd.com">mailto:Hawking.Zhang@amd.com</a>><br>
><br>
> Could you give us some idea about it,<br>
><br>
> Thanks.<br>
><br>
> Best Regards,<br>
> Kevin<br>
><br>
> ------------------------------------------------------------------------<br>
><br>
> *From:*Quan, Evan <Evan.Quan@amd.com <<a href="mailto:Evan.Quan@amd.com">mailto:Evan.Quan@amd.com</a>>><br>
> *Sent:* Thursday, July 25, 2019 4:30 PM<br>
> *To:* Wang, Kevin(Yang) <Kevin1.Wang@amd.com <br>
> <<a href="mailto:Kevin1.Wang@amd.com">mailto:Kevin1.Wang@amd.com</a>>>; amd-gfx@lists.freedesktop.org
<br>
> <<a href="mailto:amd-gfx@lists.freedesktop.org">mailto:amd-gfx@lists.freedesktop.org</a>> <amd-gfx@lists.freedesktop.org
<br>
> <<a href="mailto:amd-gfx@lists.freedesktop.org">mailto:amd-gfx@lists.freedesktop.org</a>>><br>
> *Cc:* Deucher, Alexander <Alexander.Deucher@amd.com <br>
> <<a href="mailto:Alexander.Deucher@amd.com">mailto:Alexander.Deucher@amd.com</a>>>; Huang, Ray <Ray.Huang@amd.com
<br>
> <<a href="mailto:Ray.Huang@amd.com">mailto:Ray.Huang@amd.com</a>>>; Feng, Kenneth <Kenneth.Feng@amd.com
<br>
> <<a href="mailto:Kenneth.Feng@amd.com">mailto:Kenneth.Feng@amd.com</a>>><br>
> *Subject:* RE: [PATCH 5/5] drm/amd/powerplay: implment sysfs feature <br>
> status function in smu<br>
><br>
> To keep backward compatibility, we cannot change the sysfs file naming.<br>
><br>
> But it’s a good idea to summarize these as common APIs.<br>
><br>
> Regards,<br>
><br>
> Evan<br>
><br>
> *From:* amd-gfx <amd-gfx-bounces@lists.freedesktop.org <br>
> <<a href="mailto:amd-gfx-bounces@lists.freedesktop.org">mailto:amd-gfx-bounces@lists.freedesktop.org</a>>> *On Behalf Of *Wang,
<br>
> Kevin(Yang)<br>
> *Sent:* Thursday, July 25, 2019 4:10 PM<br>
> *To:* amd-gfx@lists.freedesktop.org <<a href="mailto:amd-gfx@lists.freedesktop.org">mailto:amd-gfx@lists.freedesktop.org</a>><br>
> *Cc:* Deucher, Alexander <Alexander.Deucher@amd.com <br>
> <<a href="mailto:Alexander.Deucher@amd.com">mailto:Alexander.Deucher@amd.com</a>>>; Huang, Ray <Ray.Huang@amd.com
<br>
> <<a href="mailto:Ray.Huang@amd.com">mailto:Ray.Huang@amd.com</a>>>; Feng, Kenneth <Kenneth.Feng@amd.com
<br>
> <<a href="mailto:Kenneth.Feng@amd.com">mailto:Kenneth.Feng@amd.com</a>>><br>
> *Subject:* Re: [PATCH 5/5] drm/amd/powerplay: implment sysfs feature <br>
> status function in smu<br>
><br>
> add sample data from sysfs pp_features with this patch.<br>
><br>
> print format:<br>
><br>
> index. feature name (Hardware Message ID): state<br>
><br>
> /sudo find /sys -name "pp_features" -exec cat {} \;/<br>
><br>
> features high: 0x00000623 low: 0xb3cdaffb<br>
><br>
> 00. DPM_PREFETCHER       ( 0) : enabeld<br>
><br>
> 01. DPM_GFXCLK           ( 1) : enabeld<br>
><br>
> 02. DPM_UCLK             ( 3) : enabeld<br>
><br>
> 03. DPM_SOCCLK           ( 4) : enabeld<br>
><br>
> 04. DPM_MP0CLK           ( 5) : enabeld<br>
><br>
> 05. DPM_LINK             ( 6) : enabeld<br>
><br>
> 06. DPM_DCEFCLK          ( 7) : enabeld<br>
><br>
> 07. DS_GFXCLK            (10) : enabeld<br>
><br>
> 08. DS_SOCCLK            (11) : enabeld<br>
><br>
> 09. DS_LCLK              (12) : disabled<br>
><br>
> 10. PPT                (23) : enabeld<br>
><br>
> 11. TDC                (24) : enabeld<br>
><br>
> 12. THERMAL              (33) : enabeld<br>
><br>
> 13. RM                 (35) : disabled<br>
><br>
> 14. DS_DCEFCLK           (13) : enabeld<br>
><br>
> 15. ACDC                 (28) : enabeld<br>
><br>
> 16. VR0HOT               (29) : enabeld<br>
><br>
> 17. VR1HOT               (30) : disabled<br>
><br>
> 18. FW_CTF               (31) : enabeld<br>
><br>
> 19. LED_DISPLAY          (36) : disabled<br>
><br>
> 20. FAN_CONTROL          (32) : enabeld<br>
><br>
> 21. GFX_EDC              (25) : enabeld<br>
><br>
> 22. GFXOFF               (17) : disabled<br>
><br>
> 23. DPM_GFX_PACE         ( 2) : disabled<br>
><br>
> 24. MEM_VDDCI_SCALING    ( 8) : enabeld<br>
><br>
> 25. MEM_MVDD_SCALING     ( 9) : enabeld<br>
><br>
> 26. DS_UCLK              (14) : disabled<br>
><br>
> 27. GFX_ULV              (15) : enabeld<br>
><br>
> 28. FW_DSTATE            (16) : enabeld<br>
><br>
> 29. BACO                 (18) : enabeld<br>
><br>
> 30. VCN_PG               (19) : enabeld<br>
><br>
> 31. JPEG_PG              (20) : disabled<br>
><br>
> 32. USB_PG               (21) : disabled<br>
><br>
> 33. RSMU_SMN_CG          (22) : enabeld<br>
><br>
> 34. APCC_PLUS            (26) : disabled<br>
><br>
> 35. GTHR                 (27) : disabled<br>
><br>
> 36. GFX_DCS              (34) : disabled<br>
><br>
> 37. GFX_SS               (37) : enabeld<br>
><br>
> 38. OUT_OF_BAND_MONITOR  (38) : disabled<br>
><br>
> 39. TEMP_DEPENDENT_VMIN  (39) : disabled<br>
><br>
> 40. MMHUB_PG             (40) : disabled<br>
><br>
> 41. ATHUB_PG             (41) : enabeld<br>
><br>
> ------------------------------------------------------------------------<br>
><br>
> *From:*Wang, Kevin(Yang) <Kevin1.Wang@amd.com <br>
> <<a href="mailto:Kevin1.Wang@amd.com">mailto:Kevin1.Wang@amd.com</a>>><br>
> *Sent:* Thursday, July 25, 2019 1:11 PM<br>
> *To:* amd-gfx@lists.freedesktop.org <br>
> <<a href="mailto:amd-gfx@lists.freedesktop.org">mailto:amd-gfx@lists.freedesktop.org</a>> <amd-gfx@lists.freedesktop.org
<br>
> <<a href="mailto:amd-gfx@lists.freedesktop.org">mailto:amd-gfx@lists.freedesktop.org</a>>><br>
> *Cc:* Feng, Kenneth <Kenneth.Feng@amd.com <br>
> <<a href="mailto:Kenneth.Feng@amd.com">mailto:Kenneth.Feng@amd.com</a>>>; Huang, Ray <Ray.Huang@amd.com
<br>
> <<a href="mailto:Ray.Huang@amd.com">mailto:Ray.Huang@amd.com</a>>>; Deucher, Alexander
<br>
> <Alexander.Deucher@amd.com <<a href="mailto:Alexander.Deucher@amd.com">mailto:Alexander.Deucher@amd.com</a>>>; Wang,
<br>
> Kevin(Yang) <Kevin1.Wang@amd.com <<a href="mailto:Kevin1.Wang@amd.com">mailto:Kevin1.Wang@amd.com</a>>><br>
> *Subject:* [PATCH 5/5] drm/amd/powerplay: implment sysfs feature <br>
> status function in smu<br>
><br>
> 1. Unified feature enable status format in sysfs<br>
> 2. Rename ppfeature to pp_features to adapt other pp sysfs node name<br>
> 3. this function support all asic, not asic related function.<br>
><br>
> Signed-off-by: Kevin Wang <kevin1.wang@amd.com <br>
> <<a href="mailto:kevin1.wang@amd.com">mailto:kevin1.wang@amd.com</a>>><br>
> ---<br>
>  drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c |  24 +--<br>
>  drivers/gpu/drm/amd/powerplay/amdgpu_smu.c |  61 +++++++<br>
>  .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h |   8 +-<br>
>  drivers/gpu/drm/amd/powerplay/navi10_ppt.c    | 165 ------------------<br>
>  drivers/gpu/drm/amd/powerplay/vega20_ppt.c    | 153 ----------------<br>
>  5 files changed, 75 insertions(+), 336 deletions(-)<br>
><br>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c <br>
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c<br>
> index 866097d5cf26..9e8e8a65d9bf 100644<br>
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c<br>
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c<br>
> @@ -788,10 +788,10 @@ static ssize_t <br>
> amdgpu_get_pp_od_clk_voltage(struct device *dev,<br>
>  }<br>
><br>
>  /**<br>
> - * DOC: ppfeatures<br>
> + * DOC: pp_features<br>
>   *<br>
>   * The amdgpu driver provides a sysfs API for adjusting what powerplay<br>
> - * features to be enabled. The file ppfeatures is used for this. And<br>
> + * features to be enabled. The file pp_features is used for this. And<br>
>   * this is only available for Vega10 and later dGPUs.<br>
>   *<br>
>   * Reading back the file will show you the followings:<br>
> @@ -803,7 +803,7 @@ static ssize_t amdgpu_get_pp_od_clk_voltage(struct <br>
> device *dev,<br>
>   * the corresponding bit from original ppfeature masks and input the<br>
>   * new ppfeature masks.<br>
>   */<br>
> -static ssize_t amdgpu_set_ppfeature_status(struct device *dev,<br>
> +static ssize_t amdgpu_set_pp_feature_status(struct device *dev,<br>
>                  struct device_attribute *attr,<br>
>                  const char *buf,<br>
>                  size_t count)<br>
> @@ -820,7 +820,7 @@ static ssize_t amdgpu_set_ppfeature_status(struct <br>
> device *dev,<br>
>          pr_debug("featuremask = 0x%llx\n", featuremask);<br>
><br>
>          if (is_support_sw_smu(adev)) {<br>
> -               ret = smu_set_ppfeature_status(&adev->smu, featuremask);<br>
> +               ret = smu_sys_set_pp_feature_mask(&adev->smu, <br>
> featuremask);<br>
>                  if (ret)<br>
>                          return -EINVAL;<br>
>          } else if (adev->powerplay.pp_funcs->set_ppfeature_status) {<br>
> @@ -832,7 +832,7 @@ static ssize_t amdgpu_set_ppfeature_status(struct <br>
> device *dev,<br>
>          return count;<br>
>  }<br>
><br>
> -static ssize_t amdgpu_get_ppfeature_status(struct device *dev,<br>
> +static ssize_t amdgpu_get_pp_feature_status(struct device *dev,<br>
>                  struct device_attribute *attr,<br>
>                  char *buf)<br>
>  {<br>
> @@ -840,7 +840,7 @@ static ssize_t amdgpu_get_ppfeature_status(struct <br>
> device *dev,<br>
>          struct amdgpu_device *adev = ddev->dev_private;<br>
><br>
>          if (is_support_sw_smu(adev)) {<br>
> -               return smu_get_ppfeature_status(&adev->smu, buf);<br>
> +               return smu_sys_get_pp_feature_mask(&adev->smu, buf);<br>
>          } else if (adev->powerplay.pp_funcs->get_ppfeature_status)<br>
>                  return amdgpu_dpm_get_ppfeature_status(adev, buf);<br>
><br>
> @@ -1500,9 +1500,9 @@ static DEVICE_ATTR(gpu_busy_percent, S_IRUGO,<br>
>  static DEVICE_ATTR(mem_busy_percent, S_IRUGO,<br>
>                  amdgpu_get_memory_busy_percent, NULL);<br>
>  static DEVICE_ATTR(pcie_bw, S_IRUGO, amdgpu_get_pcie_bw, NULL);<br>
> -static DEVICE_ATTR(ppfeatures, S_IRUGO | S_IWUSR,<br>
> -               amdgpu_get_ppfeature_status,<br>
> -               amdgpu_set_ppfeature_status);<br>
> +static DEVICE_ATTR(pp_features, S_IRUGO | S_IWUSR,<br>
> +               amdgpu_get_pp_feature_status,<br>
> +               amdgpu_set_pp_feature_status);<br>
>  static DEVICE_ATTR(unique_id, S_IRUGO, amdgpu_get_unique_id, NULL);<br>
><br>
>  static ssize_t amdgpu_hwmon_show_temp(struct device *dev,<br>
> @@ -2960,10 +2960,10 @@ int amdgpu_pm_sysfs_init(struct amdgpu_device <br>
> *adev)<br>
>          if ((adev->asic_type >= CHIP_VEGA10) &&<br>
>              !(adev->flags & AMD_IS_APU)) {<br>
>                  ret = device_create_file(adev->dev,<br>
> - &dev_attr_ppfeatures);<br>
> + &dev_attr_pp_features);<br>
>                  if (ret) {<br>
>                          DRM_ERROR("failed to create device file "<br>
> - "ppfeatures\n");<br>
> + "pp_features\n");<br>
>                          return ret;<br>
>                  }<br>
>          }<br>
> @@ -3017,7 +3017,7 @@ void amdgpu_pm_sysfs_fini(struct amdgpu_device <br>
> *adev)<br>
> device_remove_file(adev->dev, &dev_attr_unique_id);<br>
>          if ((adev->asic_type >= CHIP_VEGA10) &&<br>
>              !(adev->flags & AMD_IS_APU))<br>
> -               device_remove_file(adev->dev, &dev_attr_ppfeatures);<br>
> +               device_remove_file(adev->dev, &dev_attr_pp_features);<br>
>  }<br>
><br>
>  void amdgpu_pm_compute_clocks(struct amdgpu_device *adev)<br>
> diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c <br>
> b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c<br>
> index e881de955388..90833ff2fe00 100644<br>
> --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c<br>
> +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c<br>
> @@ -55,6 +55,67 @@ const char *smu_get_feature_name(struct smu_context <br>
> *smu, enum smu_feature_mask<br>
>          return __smu_feature_names[feature];<br>
>  }<br>
><br>
> +size_t smu_sys_get_pp_feature_mask(struct smu_context *smu, char *buf)<br>
> +{<br>
> +       size_t size = 0;<br>
> +       int ret = 0, i = 0;<br>
> +       uint32_t feature_mask[2] = { 0 };<br>
> +       int32_t feature_index = 0;<br>
> +       uint32_t count = 0;<br>
> +<br>
> +       ret = smu_feature_get_enabled_mask(smu, feature_mask, 2);<br>
> +       if (ret)<br>
> +               goto failed;<br>
> +<br>
> +       size =  sprintf(buf + size, "features high: 0x%08x low: 0x%08x\n",<br>
> +                       feature_mask[1], feature_mask[0]);<br>
> +<br>
> +       for (i = 0; i < SMU_FEATURE_COUNT; i++) {<br>
> +               feature_index = smu_feature_get_index(smu, i);<br>
> +               if (feature_index < 0)<br>
> +                       continue;<br>
> +               size += sprintf(buf + size, "%02d. %-20s (%2d) : %s\n",<br>
> +                              count++,<br>
> + smu_get_feature_name(smu, i),<br>
> +                              feature_index,<br>
> + !!smu_feature_is_enabled(smu, i) ? "enabeld" : "disabled");<br>
> +       }<br>
> +<br>
> +failed:<br>
> +       return size;<br>
> +}<br>
> +<br>
> +int smu_sys_set_pp_feature_mask(struct smu_context *smu, uint64_t <br>
> new_mask)<br>
> +{<br>
> +       int ret = 0;<br>
> +       uint32_t feature_mask[2] = { 0 };<br>
> +       uint64_t feature_2_enabled = 0;<br>
> +       uint64_t feature_2_disabled = 0;<br>
> +       uint64_t feature_enables = 0;<br>
> +<br>
> +       ret = smu_feature_get_enabled_mask(smu, feature_mask, 2);<br>
> +       if (ret)<br>
> +               return ret;<br>
> +<br>
> +       feature_enables = ((uint64_t)feature_mask[1] << 32 | <br>
> (uint64_t)feature_mask[0]);<br>
> +<br>
> +       feature_2_enabled  = ~feature_enables & new_mask;<br>
> +       feature_2_disabled = feature_enables & ~new_mask;<br>
> +<br>
> +       if (feature_2_enabled) {<br>
> +               ret = smu_feature_update_enable_state(smu, <br>
> feature_2_enabled, true);<br>
> +               if (ret)<br>
> +                       ret;<br>
> +       }<br>
> +       if (feature_2_disabled) {<br>
> +               ret = smu_feature_update_enable_state(smu, <br>
> feature_2_disabled, false);<br>
> +               if (ret)<br>
> +                       return ret;<br>
> +       }<br>
> +<br>
> +       return ret;<br>
> +}<br>
> +<br>
>  int smu_get_smc_version(struct smu_context *smu, uint32_t <br>
> *if_version, uint32_t *smu_version)<br>
>  {<br>
>          int ret = 0;<br>
> diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h <br>
> b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h<br>
> index abc2644b4c07..ac9e9d5d8a5c 100644<br>
> --- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h<br>
> +++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h<br>
> @@ -432,8 +432,6 @@ struct pptable_funcs {<br>
>                                        uint32_t *mclk_mask,<br>
>                                        uint32_t *soc_mask);<br>
>          int (*set_cpu_power_state)(struct smu_context *smu);<br>
> -       int (*set_ppfeature_status)(struct smu_context *smu, uint64_t <br>
> ppfeatures);<br>
> -       int (*get_ppfeature_status)(struct smu_context *smu, char *buf);<br>
>          bool (*is_dpm_running)(struct smu_context *smu);<br>
>          int (*tables_init)(struct smu_context *smu, struct smu_table <br>
> *tables);<br>
>          int (*set_thermal_fan_table)(struct smu_context *smu);<br>
> @@ -713,10 +711,6 @@ struct smu_funcs<br>
> ((smu)->ppt_funcs->dpm_set_vce_enable ? <br>
> (smu)->ppt_funcs->dpm_set_vce_enable((smu), (enable)) : 0)<br>
>  #define smu_set_xgmi_pstate(smu, pstate) \<br>
> ((smu)->funcs->set_xgmi_pstate ? (smu)->funcs->set_xgmi_pstate((smu), <br>
> (pstate)) : 0)<br>
> -#define smu_set_ppfeature_status(smu, ppfeatures) \<br>
> - ((smu)->ppt_funcs->set_ppfeature_status ? <br>
> (smu)->ppt_funcs->set_ppfeature_status((smu), (ppfeatures)) : -EINVAL)<br>
> -#define smu_get_ppfeature_status(smu, buf) \<br>
> - ((smu)->ppt_funcs->get_ppfeature_status ? <br>
> (smu)->ppt_funcs->get_ppfeature_status((smu), (buf)) : -EINVAL)<br>
>  #define smu_set_watermarks_table(smu, tab, clock_ranges) \<br>
> ((smu)->ppt_funcs->set_watermarks_table ? <br>
> (smu)->ppt_funcs->set_watermarks_table((smu), (tab), (clock_ranges)) : 0)<br>
>  #define smu_get_current_clk_freq_by_table(smu, clk_type, value) \<br>
> @@ -804,5 +798,7 @@ bool smu_clk_dpm_is_enabled(struct smu_context <br>
> *smu, enum smu_clk_type clk_type)<br>
>  int smu_feature_update_enable_state(struct smu_context *smu, uint64_t <br>
> feature_mask, bool enabled);<br>
>  const char *smu_get_message_name(struct smu_context *smu, enum <br>
> smu_message_type type);<br>
>  const char *smu_get_feature_name(struct smu_context *smu, enum <br>
> smu_feature_mask feature);<br>
> +size_t smu_sys_get_pp_feature_mask(struct smu_context *smu, char *buf);<br>
> +int smu_sys_set_pp_feature_mask(struct smu_context *smu, uint64_t <br>
> new_mask);<br>
><br>
>  #endif<br>
> diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c <br>
> b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c<br>
> index c873228bf05f..cd0920093a5e 100644<br>
> --- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c<br>
> +++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c<br>
> @@ -1422,169 +1422,6 @@ static int navi10_get_uclk_dpm_states(struct <br>
> smu_context *smu, uint32_t *clocks_<br>
>          return 0;<br>
>  }<br>
><br>
> -static int navi10_get_ppfeature_status(struct smu_context *smu,<br>
> -                                      char *buf)<br>
> -{<br>
> -       static const char *ppfeature_name[] = {<br>
> - "DPM_PREFETCHER",<br>
> -                               "DPM_GFXCLK",<br>
> -                               "DPM_GFX_PACE",<br>
> -                               "DPM_UCLK",<br>
> -                               "DPM_SOCCLK",<br>
> -                               "DPM_MP0CLK",<br>
> -                               "DPM_LINK",<br>
> -                               "DPM_DCEFCLK",<br>
> - "MEM_VDDCI_SCALING",<br>
> - "MEM_MVDD_SCALING",<br>
> -                               "DS_GFXCLK",<br>
> -                               "DS_SOCCLK",<br>
> -                               "DS_LCLK",<br>
> -                               "DS_DCEFCLK",<br>
> -                               "DS_UCLK",<br>
> -                               "GFX_ULV",<br>
> -                               "FW_DSTATE",<br>
> -                               "GFXOFF",<br>
> -                               "BACO",<br>
> -                               "VCN_PG",<br>
> -                               "JPEG_PG",<br>
> -                               "USB_PG",<br>
> -                               "RSMU_SMN_CG",<br>
> -                               "PPT",<br>
> -                               "TDC",<br>
> -                               "GFX_EDC",<br>
> -                               "APCC_PLUS",<br>
> -                               "GTHR",<br>
> -                               "ACDC",<br>
> -                               "VR0HOT",<br>
> -                               "VR1HOT",<br>
> -                               "FW_CTF",<br>
> -                               "FAN_CONTROL",<br>
> -                               "THERMAL",<br>
> -                               "GFX_DCS",<br>
> -                               "RM",<br>
> -                               "LED_DISPLAY",<br>
> -                               "GFX_SS",<br>
> - "OUT_OF_BAND_MONITOR",<br>
> - "TEMP_DEPENDENT_VMIN",<br>
> -                               "MMHUB_PG",<br>
> -                               "ATHUB_PG"};<br>
> -       static const char *output_title[] = {<br>
> -                               "FEATURES",<br>
> -                               "BITMASK",<br>
> -                               "ENABLEMENT"};<br>
> -       uint64_t features_enabled;<br>
> -       uint32_t feature_mask[2];<br>
> -       int i;<br>
> -       int ret = 0;<br>
> -       int size = 0;<br>
> -<br>
> -       ret = smu_feature_get_enabled_mask(smu, feature_mask, 2);<br>
> -       PP_ASSERT_WITH_CODE(!ret,<br>
> -                       "[GetPPfeatureStatus] Failed to get enabled <br>
> smc features!",<br>
> -                       return ret);<br>
> -       features_enabled = (uint64_t)feature_mask[0] |<br>
> - (uint64_t)feature_mask[1] << 32;<br>
> -<br>
> -       size += sprintf(buf + size, "Current ppfeatures: 0x%016llx\n", <br>
> features_enabled);<br>
> -       size += sprintf(buf + size, "%-19s %-22s %s\n",<br>
> -                               output_title[0],<br>
> -                               output_title[1],<br>
> - output_title[2]);<br>
> -       for (i = 0; i < (sizeof(ppfeature_name) / <br>
> sizeof(ppfeature_name[0])); i++) {<br>
> -               size += sprintf(buf + size, "%-19s 0x%016llx %6s\n",<br>
> - ppfeature_name[i],<br>
> -                                       1ULL << i,<br>
> - (features_enabled & (1ULL << i)) ? "Y" : "N");<br>
> -       }<br>
> -<br>
> -       return size;<br>
> -}<br>
> -<br>
> -static int navi10_enable_smc_features(struct smu_context *smu,<br>
> -                                     bool enabled,<br>
> -                                     uint64_t feature_masks)<br>
> -{<br>
> -       struct smu_feature *feature = &smu->smu_feature;<br>
> -       uint32_t feature_low, feature_high;<br>
> -       uint32_t feature_mask[2];<br>
> -       int ret = 0;<br>
> -<br>
> -       feature_low = (uint32_t)(feature_masks & 0xFFFFFFFF);<br>
> -       feature_high = (uint32_t)((feature_masks & <br>
> 0xFFFFFFFF00000000ULL) >> 32);<br>
> -<br>
> -       if (enabled) {<br>
> -               ret = smu_send_smc_msg_with_param(smu, <br>
> SMU_MSG_EnableSmuFeaturesLow,<br>
> -                                                 feature_low);<br>
> -               if (ret)<br>
> -                       return ret;<br>
> -               ret = smu_send_smc_msg_with_param(smu, <br>
> SMU_MSG_EnableSmuFeaturesHigh,<br>
> -                                                 feature_high);<br>
> -               if (ret)<br>
> -                       return ret;<br>
> -       } else {<br>
> -               ret = smu_send_smc_msg_with_param(smu, <br>
> SMU_MSG_DisableSmuFeaturesLow,<br>
> -                                                 feature_low);<br>
> -               if (ret)<br>
> -                       return ret;<br>
> -               ret = smu_send_smc_msg_with_param(smu, <br>
> SMU_MSG_DisableSmuFeaturesHigh,<br>
> -                                                 feature_high);<br>
> -               if (ret)<br>
> -                       return ret;<br>
> -       }<br>
> -<br>
> -       ret = smu_feature_get_enabled_mask(smu, feature_mask, 2);<br>
> -       if (ret)<br>
> -               return ret;<br>
> -<br>
> -       mutex_lock(&feature->mutex);<br>
> -       bitmap_copy(feature->enabled, (unsigned long *)&feature_mask,<br>
> -                   feature->feature_num);<br>
> -       mutex_unlock(&feature->mutex);<br>
> -<br>
> -       return 0;<br>
> -}<br>
> -<br>
> -static int navi10_set_ppfeature_status(struct smu_context *smu,<br>
> -                                      uint64_t new_ppfeature_masks)<br>
> -{<br>
> -       uint64_t features_enabled;<br>
> -       uint32_t feature_mask[2];<br>
> -       uint64_t features_to_enable;<br>
> -       uint64_t features_to_disable;<br>
> -       int ret = 0;<br>
> -<br>
> -       ret = smu_feature_get_enabled_mask(smu, feature_mask, 2);<br>
> -       PP_ASSERT_WITH_CODE(!ret,<br>
> -                       "[SetPPfeatureStatus] Failed to get enabled <br>
> smc features!",<br>
> -                       return ret);<br>
> -       features_enabled = (uint64_t)feature_mask[0] |<br>
> - (uint64_t)feature_mask[1] << 32;<br>
> -<br>
> -       features_to_disable =<br>
> -               features_enabled & ~new_ppfeature_masks;<br>
> -       features_to_enable =<br>
> -               ~features_enabled & new_ppfeature_masks;<br>
> -<br>
> -       pr_debug("features_to_disable 0x%llx\n", features_to_disable);<br>
> -       pr_debug("features_to_enable 0x%llx\n", features_to_enable);<br>
> -<br>
> -       if (features_to_disable) {<br>
> -               ret = navi10_enable_smc_features(smu, false, <br>
> features_to_disable);<br>
> -               PP_ASSERT_WITH_CODE(!ret,<br>
> - "[SetPPfeatureStatus] Failed to disable smc features!",<br>
> -                               return ret);<br>
> -       }<br>
> -<br>
> -       if (features_to_enable) {<br>
> -               ret = navi10_enable_smc_features(smu, true, <br>
> features_to_enable);<br>
> -               PP_ASSERT_WITH_CODE(!ret,<br>
> - "[SetPPfeatureStatus] Failed to enable smc features!",<br>
> -                               return ret);<br>
> -       }<br>
> -<br>
> -       return 0;<br>
> -}<br>
> -<br>
>  static int navi10_set_peak_clock_by_device(struct smu_context *smu)<br>
>  {<br>
>          struct amdgpu_device *adev = smu->adev;<br>
> @@ -1689,8 +1526,6 @@ static const struct pptable_funcs <br>
> navi10_ppt_funcs = {<br>
>          .set_watermarks_table = navi10_set_watermarks_table,<br>
>          .read_sensor = navi10_read_sensor,<br>
>          .get_uclk_dpm_states = navi10_get_uclk_dpm_states,<br>
> -       .get_ppfeature_status = navi10_get_ppfeature_status,<br>
> -       .set_ppfeature_status = navi10_set_ppfeature_status,<br>
>          .set_performance_level = navi10_set_performance_level,<br>
>          .get_thermal_temperature_range = <br>
> navi10_get_thermal_temperature_range,<br>
>  };<br>
> diff --git a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c <br>
> b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c<br>
> index c06a9472c3b2..52c8fc9f1ff4 100644<br>
> --- a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c<br>
> +++ b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c<br>
> @@ -2858,157 +2858,6 @@ static int vega20_dpm_set_vce_enable(struct <br>
> smu_context *smu, bool enable)<br>
>          return smu_feature_set_enabled(smu, SMU_FEATURE_DPM_VCE_BIT, <br>
> enable);<br>
>  }<br>
><br>
> -static int vega20_get_enabled_smc_features(struct smu_context *smu,<br>
> -               uint64_t *features_enabled)<br>
> -{<br>
> -       uint32_t feature_mask[2] = {0, 0};<br>
> -       int ret = 0;<br>
> -<br>
> -       ret = smu_feature_get_enabled_mask(smu, feature_mask, 2);<br>
> -       if (ret)<br>
> -               return ret;<br>
> -<br>
> -       *features_enabled = ((((uint64_t)feature_mask[0] << <br>
> SMU_FEATURES_LOW_SHIFT) & SMU_FEATURES_LOW_MASK) |<br>
> - (((uint64_t)feature_mask[1] << SMU_FEATURES_HIGH_SHIFT) & <br>
> SMU_FEATURES_HIGH_MASK));<br>
> -<br>
> -       return ret;<br>
> -}<br>
> -<br>
> -static int vega20_enable_smc_features(struct smu_context *smu,<br>
> -               bool enable, uint64_t feature_mask)<br>
> -{<br>
> -       uint32_t smu_features_low, smu_features_high;<br>
> -       int ret = 0;<br>
> -<br>
> -       smu_features_low = (uint32_t)((feature_mask & <br>
> SMU_FEATURES_LOW_MASK) >> SMU_FEATURES_LOW_SHIFT);<br>
> -       smu_features_high = (uint32_t)((feature_mask & <br>
> SMU_FEATURES_HIGH_MASK) >> SMU_FEATURES_HIGH_SHIFT);<br>
> -<br>
> -       if (enable) {<br>
> -               ret = smu_send_smc_msg_with_param(smu, <br>
> SMU_MSG_EnableSmuFeaturesLow,<br>
> -                                                 smu_features_low);<br>
> -               if (ret)<br>
> -                       return ret;<br>
> -               ret = smu_send_smc_msg_with_param(smu, <br>
> SMU_MSG_EnableSmuFeaturesHigh,<br>
> -                                                 smu_features_high);<br>
> -               if (ret)<br>
> -                       return ret;<br>
> -       } else {<br>
> -               ret = smu_send_smc_msg_with_param(smu, <br>
> SMU_MSG_DisableSmuFeaturesLow,<br>
> -                                                 smu_features_low);<br>
> -               if (ret)<br>
> -                       return ret;<br>
> -               ret = smu_send_smc_msg_with_param(smu, <br>
> SMU_MSG_DisableSmuFeaturesHigh,<br>
> -                                                 smu_features_high);<br>
> -               if (ret)<br>
> -                       return ret;<br>
> -       }<br>
> -<br>
> -       return 0;<br>
> -<br>
> -}<br>
> -<br>
> -static int vega20_get_ppfeature_status(struct smu_context *smu, char <br>
> *buf)<br>
> -{<br>
> -       static const char *ppfeature_name[] = {<br>
> - "DPM_PREFETCHER",<br>
> -                               "GFXCLK_DPM",<br>
> -                               "UCLK_DPM",<br>
> -                               "SOCCLK_DPM",<br>
> -                               "UVD_DPM",<br>
> -                               "VCE_DPM",<br>
> -                               "ULV",<br>
> -                               "MP0CLK_DPM",<br>
> -                               "LINK_DPM",<br>
> -                               "DCEFCLK_DPM",<br>
> -                               "GFXCLK_DS",<br>
> -                               "SOCCLK_DS",<br>
> -                               "LCLK_DS",<br>
> -                               "PPT",<br>
> -                               "TDC",<br>
> -                               "THERMAL",<br>
> -                               "GFX_PER_CU_CG",<br>
> -                               "RM",<br>
> -                               "DCEFCLK_DS",<br>
> -                               "ACDC",<br>
> -                               "VR0HOT",<br>
> -                               "VR1HOT",<br>
> -                               "FW_CTF",<br>
> -                               "LED_DISPLAY",<br>
> -                               "FAN_CONTROL",<br>
> -                               "GFX_EDC",<br>
> -                               "GFXOFF",<br>
> -                               "CG",<br>
> -                               "FCLK_DPM",<br>
> -                               "FCLK_DS",<br>
> -                               "MP1CLK_DS",<br>
> -                               "MP0CLK_DS",<br>
> -                               "XGMI",<br>
> -                               "ECC"};<br>
> -       static const char *output_title[] = {<br>
> -                               "FEATURES",<br>
> -                               "BITMASK",<br>
> -                               "ENABLEMENT"};<br>
> -       uint64_t features_enabled;<br>
> -       int i;<br>
> -       int ret = 0;<br>
> -       int size = 0;<br>
> -<br>
> -       ret = vega20_get_enabled_smc_features(smu, &features_enabled);<br>
> -       if (ret)<br>
> -               return ret;<br>
> -<br>
> -       size += sprintf(buf + size, "Current ppfeatures: 0x%016llx\n", <br>
> features_enabled);<br>
> -       size += sprintf(buf + size, "%-19s %-22s %s\n",<br>
> -                               output_title[0],<br>
> -                               output_title[1],<br>
> - output_title[2]);<br>
> -       for (i = 0; i < GNLD_FEATURES_MAX; i++) {<br>
> -               size += sprintf(buf + size, "%-19s 0x%016llx %6s\n",<br>
> - ppfeature_name[i],<br>
> -                                       1ULL << i,<br>
> - (features_enabled & (1ULL << i)) ? "Y" : "N");<br>
> -       }<br>
> -<br>
> -       return size;<br>
> -}<br>
> -<br>
> -static int vega20_set_ppfeature_status(struct smu_context *smu, <br>
> uint64_t new_ppfeature_masks)<br>
> -{<br>
> -       uint64_t features_enabled;<br>
> -       uint64_t features_to_enable;<br>
> -       uint64_t features_to_disable;<br>
> -       int ret = 0;<br>
> -<br>
> -       if (new_ppfeature_masks >= (1ULL << GNLD_FEATURES_MAX))<br>
> -               return -EINVAL;<br>
> -<br>
> -       ret = vega20_get_enabled_smc_features(smu, &features_enabled);<br>
> -       if (ret)<br>
> -               return ret;<br>
> -<br>
> -       features_to_disable =<br>
> -               features_enabled & ~new_ppfeature_masks;<br>
> -       features_to_enable =<br>
> -               ~features_enabled & new_ppfeature_masks;<br>
> -<br>
> -       pr_debug("features_to_disable 0x%llx\n", features_to_disable);<br>
> -       pr_debug("features_to_enable 0x%llx\n", features_to_enable);<br>
> -<br>
> -       if (features_to_disable) {<br>
> -               ret = vega20_enable_smc_features(smu, false, <br>
> features_to_disable);<br>
> -               if (ret)<br>
> -                       return ret;<br>
> -       }<br>
> -<br>
> -       if (features_to_enable) {<br>
> -               ret = vega20_enable_smc_features(smu, true, <br>
> features_to_enable);<br>
> -               if (ret)<br>
> -                       return ret;<br>
> -       }<br>
> -<br>
> -       return 0;<br>
> -}<br>
> -<br>
>  static bool vega20_is_dpm_running(struct smu_context *smu)<br>
>  {<br>
>          int ret = 0;<br>
> @@ -3311,8 +3160,6 @@ static const struct pptable_funcs <br>
> vega20_ppt_funcs = {<br>
>          .force_dpm_limit_value = vega20_force_dpm_limit_value,<br>
>          .unforce_dpm_levels = vega20_unforce_dpm_levels,<br>
>          .get_profiling_clk_mask = vega20_get_profiling_clk_mask,<br>
> -       .set_ppfeature_status = vega20_set_ppfeature_status,<br>
> -       .get_ppfeature_status = vega20_get_ppfeature_status,<br>
>          .is_dpm_running = vega20_is_dpm_running,<br>
>          .set_thermal_fan_table = vega20_set_thermal_fan_table,<br>
>          .get_fan_speed_percent = vega20_get_fan_speed_percent,<br>
> -- <br>
> 2.22.0<br>
><br>
</div>
</span></font></div>
</body>
</html>