Re: [PATCH v3 3/4] drm/amd/pm: Expose ppt1 limit for gc_v9_5_0

[Lazar, Lijo]

On 11/6/2025 9:03 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 (Lijo)

v3: Remove power2_average (Lijo)

Sorry, this one needs to be a separate patch. I didn't mean to combine 
with this series.

Thanks,
Lijo

Signed-off-by: Asad Kamal <asad.ka...@amd.com>
---
  drivers/gpu/drm/amd/pm/amdgpu_pm.c        | 15 ++++++++-------
  drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c |  2 ++
  2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c 
b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
index 69aa8e22f103..d9e37fd6e186 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,
@@ -3578,7 +3580,6 @@ static SENSOR_DEVICE_ATTR(power1_cap_min, S_IRUGO, 
amdgpu_hwmon_show_power_cap_m
  static SENSOR_DEVICE_ATTR(power1_cap, S_IRUGO | S_IWUSR, 
amdgpu_hwmon_show_power_cap, amdgpu_hwmon_set_power_cap, 0);
  static SENSOR_DEVICE_ATTR(power1_cap_default, S_IRUGO, 
amdgpu_hwmon_show_power_cap_default, NULL, 0);
  static SENSOR_DEVICE_ATTR(power1_label, S_IRUGO, 
amdgpu_hwmon_show_power_label, NULL, 0);
-static SENSOR_DEVICE_ATTR(power2_average, S_IRUGO, 
amdgpu_hwmon_show_power_avg, NULL, 1);
  static SENSOR_DEVICE_ATTR(power2_cap_max, S_IRUGO, 
amdgpu_hwmon_show_power_cap_max, NULL, 1);
  static SENSOR_DEVICE_ATTR(power2_cap_min, S_IRUGO, 
amdgpu_hwmon_show_power_cap_min, NULL, 1);
  static SENSOR_DEVICE_ATTR(power2_cap, S_IRUGO | S_IWUSR, 
amdgpu_hwmon_show_power_cap, amdgpu_hwmon_set_power_cap, 1);
@@ -3627,7 +3628,6 @@ static struct attribute *hwmon_attributes[] = {
        &sensor_dev_attr_power1_cap.dev_attr.attr,
        &sensor_dev_attr_power1_cap_default.dev_attr.attr,
        &sensor_dev_attr_power1_label.dev_attr.attr,
-       &sensor_dev_attr_power2_average.dev_attr.attr,
        &sensor_dev_attr_power2_cap_max.dev_attr.attr,
        &sensor_dev_attr_power2_cap_min.dev_attr.attr,
        &sensor_dev_attr_power2_cap.dev_attr.attr,
@@ -3826,13 +3826,14 @@ static umode_t hwmon_attributes_visible(struct kobject 
*kobj,
                return 0;
  
  	/* only Vangogh has fast PPT limit and power labels */
-       if (!(gc_ver == IP_VERSION(10, 3, 1)) &&
-           (attr == &sensor_dev_attr_power2_average.dev_attr.attr ||
-            attr == &sensor_dev_attr_power2_cap_max.dev_attr.attr ||
+       if ((attr == &sensor_dev_attr_power2_cap_max.dev_attr.attr ||
             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 c0e7c45ac0e6..8b49fb86c77b 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -2938,6 +2938,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: