On 11/6/2025 5:14 PM, Asad Kamal wrote:
Expose power2_cap hwmon node for retrieving and configuring ppt1
limit on supported boards for gc_v9_5_0

v2: Remove version check

Signed-off-by: Asad Kamal <[email protected]>
---
  drivers/gpu/drm/amd/pm/amdgpu_pm.c        | 12 +++++++++---
  drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c |  2 ++
  2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c 
b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
index 69aa8e22f103..49cc5aaa749c 100644
--- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
@@ -3373,7 +3373,9 @@ static ssize_t amdgpu_hwmon_show_power_label(struct 
device *dev,
                                  to_sensor_dev_attr(attr)->index == 
PP_PWR_TYPE_FAST ?
                                  "fastPPT" : "slowPPT");
        else
-               return sysfs_emit(buf, "PPT\n");
+               return sysfs_emit(buf, "%s\n",
+                                 to_sensor_dev_attr(attr)->index == 
PP_PWR_TYPE_FAST ?
+                                 "PPT1" : "PPT");
  }
static ssize_t amdgpu_hwmon_set_power_cap(struct device *dev,
@@ -3737,7 +3739,8 @@ static umode_t hwmon_attributes_visible(struct kobject 
*kobj,
                return 0;
/* not all products support both average and instantaneous */
-       if (attr == &sensor_dev_attr_power1_average.dev_attr.attr &&
+       if ((attr == &sensor_dev_attr_power1_average.dev_attr.attr ||
+            attr == &sensor_dev_attr_power2_average.dev_attr.attr) &&

Better group this with other power2 attributes.

Thanks,
Lijo

            amdgpu_pm_get_sensor_generic(adev, AMDGPU_PP_SENSOR_GPU_AVG_POWER,
                                         (void *)&tmp) == -EOPNOTSUPP)
                return 0;
@@ -3832,7 +3835,10 @@ static umode_t hwmon_attributes_visible(struct kobject 
*kobj,
             attr == &sensor_dev_attr_power2_cap_min.dev_attr.attr ||
             attr == &sensor_dev_attr_power2_cap.dev_attr.attr ||
             attr == &sensor_dev_attr_power2_cap_default.dev_attr.attr ||
-            attr == &sensor_dev_attr_power2_label.dev_attr.attr))
+            attr == &sensor_dev_attr_power2_label.dev_attr.attr) &&
+            (amdgpu_dpm_get_power_limit(adev, &tmp,
+                                        PP_PWR_LIMIT_MAX,
+                                        PP_PWR_TYPE_FAST) == -EOPNOTSUPP))
                return 0;
return effective_mode;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c 
b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index 4317da6f7c38..73a063748c86 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -2921,6 +2921,8 @@ int smu_get_power_limit(void *handle,
        if (limit_type != SMU_DEFAULT_PPT_LIMIT) {
                if (smu->ppt_funcs->get_ppt_limit)
                        ret = smu->ppt_funcs->get_ppt_limit(smu, limit, 
limit_type, limit_level);
+               else
+                       return -EOPNOTSUPP;
        } else {
                switch (limit_level) {
                case SMU_PPT_LIMIT_CURRENT:

Reply via email to