Here's v2 of this series, now also with support for setting the zero RPM
stop temperature. Additionally, the fan_zero_rpm knob has been renamed
fan_zero_rpm_enable.
As before I successfully tested both changes on my own system.
Wolfgang Müller (2):
drm/amd/pm: add zero RPM OD setting support for SMU13
drm/amd/pm: add zero RPM stop temperature OD setting support for SMU13
Documentation/gpu/amdgpu/thermal.rst | 12 ++
.../gpu/drm/amd/include/kgd_pp_interface.h | 4 +
drivers/gpu/drm/amd/pm/amdgpu_pm.c | 127 ++++++++++++++++++
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 4 +
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 4 +
drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 2 +
.../drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 108 ++++++++++++++-
.../drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 108 ++++++++++++++-
8 files changed, 367 insertions(+), 2 deletions(-)
Range-diff against v1:
1: 633acda07 ! 1: b6233aed7 drm/amd/pm: add zero RPM OD setting support for SMU13
@@ Documentation/gpu/amdgpu/thermal.rst: fan_minimum_pwm
.. kernel-doc:: drivers/gpu/drm/amd/pm/amdgpu_pm.c
:doc: fan_minimum_pwm
-+fan_zero_rpm
++fan_zero_rpm_enable
+----------------------
+
+.. kernel-doc:: drivers/gpu/drm/amd/pm/amdgpu_pm.c
-+ :doc: fan_zero_rpm
++ :doc: fan_zero_rpm_enable
+
GFXOFF
======
@@ drivers/gpu/drm/amd/include/kgd_pp_interface.h: enum pp_clock_type {
OD_ACOUSTIC_TARGET,
OD_FAN_TARGET_TEMPERATURE,
OD_FAN_MINIMUM_PWM,
-+ OD_FAN_ZERO_RPM,
++ OD_FAN_ZERO_RPM_ENABLE,
};
enum amd_pp_sensors {
@@ drivers/gpu/drm/amd/include/kgd_pp_interface.h: enum PP_OD_DPM_TABLE_COMMAND {
PP_OD_EDIT_ACOUSTIC_TARGET,
PP_OD_EDIT_FAN_TARGET_TEMPERATURE,
PP_OD_EDIT_FAN_MINIMUM_PWM,
-+ PP_OD_EDIT_FAN_ZERO_RPM,
++ PP_OD_EDIT_FAN_ZERO_RPM_ENABLE,
};
struct pp_states_info {
@@ drivers/gpu/drm/amd/pm/amdgpu_pm.c: static umode_t fan_minimum_pwm_visible(struc
}
+/**
-+ * DOC: fan_zero_rpm
++ * DOC: fan_zero_rpm_enable
+ *
+ * The amdgpu driver provides a sysfs API for checking and adjusting the
+ * zero RPM feature.
@@ drivers/gpu/drm/amd/pm/amdgpu_pm.c: static umode_t fan_minimum_pwm_visible(struc
+ * If you want to reset to the default value, write "r" (reset) to the file to
+ * reset them.
+ */
-+static ssize_t fan_zero_rpm_show(struct kobject *kobj,
++static ssize_t fan_zero_rpm_enable_show(struct kobject *kobj,
+ struct kobj_attribute *attr,
+ char *buf)
+{
+ struct od_kobj *container = container_of(kobj, struct od_kobj, kobj);
+ struct amdgpu_device *adev = (struct amdgpu_device *)container->priv;
+
-+ return (ssize_t)amdgpu_retrieve_od_settings(adev, OD_FAN_ZERO_RPM, buf);
++ return (ssize_t)amdgpu_retrieve_od_settings(adev, OD_FAN_ZERO_RPM_ENABLE, buf);
+}
+
-+static ssize_t fan_zero_rpm_store(struct kobject *kobj,
++static ssize_t fan_zero_rpm_enable_store(struct kobject *kobj,
+ struct kobj_attribute *attr,
+ const char *buf,
+ size_t count)
@@ drivers/gpu/drm/amd/pm/amdgpu_pm.c: static umode_t fan_minimum_pwm_visible(struc
+ struct amdgpu_device *adev = (struct amdgpu_device *)container->priv;
+
+ return (ssize_t)amdgpu_distribute_custom_od_settings(adev,
-+ PP_OD_EDIT_FAN_ZERO_RPM,
++ PP_OD_EDIT_FAN_ZERO_RPM_ENABLE,
+ buf,
+ count);
+}
+
-+static umode_t fan_zero_rpm_visible(struct amdgpu_device *adev)
++static umode_t fan_zero_rpm_enable_visible(struct amdgpu_device *adev)
+{
+ umode_t umode = 0000;
+
-+ if (adev->pm.od_feature_mask & OD_OPS_SUPPORT_FAN_ZERO_RPM_RETRIEVE)
++ if (adev->pm.od_feature_mask & OD_OPS_SUPPORT_FAN_ZERO_RPM_ENABLE_RETRIEVE)
+ umode |= S_IRUSR | S_IRGRP | S_IROTH;
+
-+ if (adev->pm.od_feature_mask & OD_OPS_SUPPORT_FAN_ZERO_RPM_SET)
++ if (adev->pm.od_feature_mask & OD_OPS_SUPPORT_FAN_ZERO_RPM_ENABLE_SET)
+ umode |= S_IWUSR;
+
+ return umode;
@@ drivers/gpu/drm/amd/pm/amdgpu_pm.c: static struct od_feature_set amdgpu_od_set =
},
},
+ [5] = {
-+ .name = "fan_zero_rpm",
++ .name = "fan_zero_rpm_enable",
+ .ops = {
-+ .is_visible = fan_zero_rpm_visible,
-+ .show = fan_zero_rpm_show,
-+ .store = fan_zero_rpm_store,
++ .is_visible = fan_zero_rpm_enable_visible,
++ .show = fan_zero_rpm_enable_show,
++ .store = fan_zero_rpm_enable_store,
+ },
+ },
},
@@ drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h: struct config_table_setting
#define OD_OPS_SUPPORT_FAN_TARGET_TEMPERATURE_SET BIT(7)
#define OD_OPS_SUPPORT_FAN_MINIMUM_PWM_RETRIEVE BIT(8)
#define OD_OPS_SUPPORT_FAN_MINIMUM_PWM_SET BIT(9)
-+#define OD_OPS_SUPPORT_FAN_ZERO_RPM_RETRIEVE BIT(10)
-+#define OD_OPS_SUPPORT_FAN_ZERO_RPM_SET BIT(11)
++#define OD_OPS_SUPPORT_FAN_ZERO_RPM_ENABLE_RETRIEVE BIT(10)
++#define OD_OPS_SUPPORT_FAN_ZERO_RPM_ENABLE_SET BIT(11)
struct amdgpu_pm {
struct mutex mutex;
@@ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c: static enum smu_clk_type smu_convert_
clk_type = SMU_OD_FAN_TARGET_TEMPERATURE; break;
case OD_FAN_MINIMUM_PWM:
clk_type = SMU_OD_FAN_MINIMUM_PWM; break;
-+ case OD_FAN_ZERO_RPM:
-+ clk_type = SMU_OD_FAN_ZERO_RPM; break;
++ case OD_FAN_ZERO_RPM_ENABLE:
++ clk_type = SMU_OD_FAN_ZERO_RPM_ENABLE; break;
default:
clk_type = SMU_CLK_COUNT; break;
}
@@ drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h: enum smu_clk_type {
SMU_OD_ACOUSTIC_TARGET,
SMU_OD_FAN_TARGET_TEMPERATURE,
SMU_OD_FAN_MINIMUM_PWM,
-+ SMU_OD_FAN_ZERO_RPM,
++ SMU_OD_FAN_ZERO_RPM_ENABLE,
SMU_CLK_COUNT,
};
@@ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
#define PP_OD_FEATURE_FAN_ACOUSTIC_TARGET 8
#define PP_OD_FEATURE_FAN_TARGET_TEMPERATURE 9
#define PP_OD_FEATURE_FAN_MINIMUM_PWM 10
-+#define PP_OD_FEATURE_FAN_ZERO_RPM 11
++#define PP_OD_FEATURE_FAN_ZERO_RPM_ENABLE 11
#define LINK_SPEED_MAX 3
@@ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c: static void smu_v13_0_0_ge
od_min_setting = overdrive_lowerlimits->FanMinimumPwm;
od_max_setting = overdrive_upperlimits->FanMinimumPwm;
break;
-+ case PP_OD_FEATURE_FAN_ZERO_RPM:
++ case PP_OD_FEATURE_FAN_ZERO_RPM_ENABLE:
+ od_min_setting = overdrive_lowerlimits->FanZeroRpmEnable;
+ od_max_setting = overdrive_upperlimits->FanZeroRpmEnable;
+ break;
@@ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c: static int smu_v13_0_0_pri
min_value, max_value);
break;
-+ case SMU_OD_FAN_ZERO_RPM:
++ case SMU_OD_FAN_ZERO_RPM_ENABLE:
+ if (!smu_v13_0_0_is_od_feature_supported(smu,
+ PP_OD_FEATURE_ZERO_FAN_BIT))
+ break;
+
-+ size += sysfs_emit_at(buf, size, "FAN_ZERO_RPM:\n");
++ size += sysfs_emit_at(buf, size, "FAN_ZERO_RPM_ENABLE:\n");
+ size += sysfs_emit_at(buf, size, "%d\n",
+ (int)od_table->OverDriveTable.FanZeroRpmEnable);
+
+ size += sysfs_emit_at(buf, size, "%s:\n", "OD_RANGE");
+ smu_v13_0_0_get_od_setting_limits(smu,
-+ PP_OD_FEATURE_FAN_ZERO_RPM,
++ PP_OD_FEATURE_FAN_ZERO_RPM_ENABLE,
+ &min_value,
+ &max_value);
-+ size += sysfs_emit_at(buf, size, "ZERO_RPM: %u %u\n",
++ size += sysfs_emit_at(buf, size, "ZERO_RPM_ENABLE: %u %u\n",
+ min_value, max_value);
+ break;
+
@@ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c: static int smu_v13_0_0_od_
od_table->OverDriveTable.FanMode = FAN_MODE_AUTO;
od_table->OverDriveTable.FeatureCtrlMask |= BIT(PP_OD_FEATURE_FAN_CURVE_BIT);
break;
-+ case PP_OD_EDIT_FAN_ZERO_RPM:
++ case PP_OD_EDIT_FAN_ZERO_RPM_ENABLE:
+ od_table->OverDriveTable.FanZeroRpmEnable =
+ boot_overdrive_table->OverDriveTable.FanZeroRpmEnable;
+ od_table->OverDriveTable.FeatureCtrlMask |= BIT(PP_OD_FEATURE_ZERO_FAN_BIT);
@@ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c: static int smu_v13_0_0_od_
od_table->OverDriveTable.FeatureCtrlMask |= BIT(PP_OD_FEATURE_FAN_CURVE_BIT);
break;
-+ case PP_OD_EDIT_FAN_ZERO_RPM:
++ case PP_OD_EDIT_FAN_ZERO_RPM_ENABLE:
+ if (!smu_v13_0_0_is_od_feature_supported(smu, PP_OD_FEATURE_ZERO_FAN_BIT)) {
+ dev_warn(adev->dev, "Zero RPM setting not supported!\n");
+ return -ENOTSUPP;
+ }
+
+ smu_v13_0_0_get_od_setting_limits(smu,
-+ PP_OD_FEATURE_FAN_ZERO_RPM,
++ PP_OD_FEATURE_FAN_ZERO_RPM_ENABLE,
+ &minimum,
+ &maximum);
+ if (input[0] < minimum ||
+ input[0] > maximum) {
-+ dev_info(adev->dev, "zero RPM setting(%ld) must be within [%d, %d]!\n",
++ dev_info(adev->dev, "zero RPM enable setting(%ld) must be within [%d, %d]!\n",
+ input[0], minimum, maximum);
+ return -EINVAL;
+ }
@@ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c: static void smu_v13_0_0_se
OD_OPS_SUPPORT_FAN_MINIMUM_PWM_RETRIEVE |
- OD_OPS_SUPPORT_FAN_MINIMUM_PWM_SET;
+ OD_OPS_SUPPORT_FAN_MINIMUM_PWM_SET |
-+ OD_OPS_SUPPORT_FAN_ZERO_RPM_RETRIEVE|
-+ OD_OPS_SUPPORT_FAN_ZERO_RPM_SET;
++ OD_OPS_SUPPORT_FAN_ZERO_RPM_ENABLE_RETRIEVE |
++ OD_OPS_SUPPORT_FAN_ZERO_RPM_ENABLE_SET;
}
static int smu_v13_0_0_set_default_od_settings(struct smu_context *smu)
@@ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
#define PP_OD_FEATURE_FAN_ACOUSTIC_TARGET 8
#define PP_OD_FEATURE_FAN_TARGET_TEMPERATURE 9
#define PP_OD_FEATURE_FAN_MINIMUM_PWM 10
-+#define PP_OD_FEATURE_FAN_ZERO_RPM 11
++#define PP_OD_FEATURE_FAN_ZERO_RPM_ENABLE 11
#define LINK_SPEED_MAX 3
@@ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c: static void smu_v13_0_7_ge
od_min_setting = overdrive_lowerlimits->FanMinimumPwm;
od_max_setting = overdrive_upperlimits->FanMinimumPwm;
break;
-+ case PP_OD_FEATURE_FAN_ZERO_RPM:
++ case PP_OD_FEATURE_FAN_ZERO_RPM_ENABLE:
+ od_min_setting = overdrive_lowerlimits->FanZeroRpmEnable;
+ od_max_setting = overdrive_upperlimits->FanZeroRpmEnable;
+ break;
@@ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c: static int smu_v13_0_7_pri
min_value, max_value);
break;
-+ case SMU_OD_FAN_ZERO_RPM:
++ case SMU_OD_FAN_ZERO_RPM_ENABLE:
+ if (!smu_v13_0_7_is_od_feature_supported(smu,
+ PP_OD_FEATURE_ZERO_FAN_BIT))
+ break;
+
-+ size += sysfs_emit_at(buf, size, "FAN_ZERO_RPM:\n");
++ size += sysfs_emit_at(buf, size, "FAN_ZERO_RPM_ENABLE:\n");
+ size += sysfs_emit_at(buf, size, "%d\n",
+ (int)od_table->OverDriveTable.FanZeroRpmEnable);
+
+ size += sysfs_emit_at(buf, size, "%s:\n", "OD_RANGE");
+ smu_v13_0_7_get_od_setting_limits(smu,
-+ PP_OD_FEATURE_FAN_ZERO_RPM,
++ PP_OD_FEATURE_FAN_ZERO_RPM_ENABLE,
+ &min_value,
+ &max_value);
-+ size += sysfs_emit_at(buf, size, "ZERO_RPM: %u %u\n",
++ size += sysfs_emit_at(buf, size, "ZERO_RPM_ENABLE: %u %u\n",
+ min_value, max_value);
+ break;
+
@@ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c: static int smu_v13_0_7_od_
od_table->OverDriveTable.FanMode = FAN_MODE_AUTO;
od_table->OverDriveTable.FeatureCtrlMask |= BIT(PP_OD_FEATURE_FAN_CURVE_BIT);
break;
-+ case PP_OD_EDIT_FAN_ZERO_RPM:
++ case PP_OD_EDIT_FAN_ZERO_RPM_ENABLE:
+ od_table->OverDriveTable.FanZeroRpmEnable =
+ boot_overdrive_table->OverDriveTable.FanZeroRpmEnable;
+ od_table->OverDriveTable.FeatureCtrlMask |= BIT(PP_OD_FEATURE_ZERO_FAN_BIT);
@@ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c: static int smu_v13_0_7_od_
od_table->OverDriveTable.FeatureCtrlMask |= BIT(PP_OD_FEATURE_FAN_CURVE_BIT);
break;
-+ case PP_OD_EDIT_FAN_ZERO_RPM:
++ case PP_OD_EDIT_FAN_ZERO_RPM_ENABLE:
+ if (!smu_v13_0_7_is_od_feature_supported(smu, PP_OD_FEATURE_ZERO_FAN_BIT)) {
+ dev_warn(adev->dev, "Zero RPM setting not supported!\n");
+ return -ENOTSUPP;
+ }
+
+ smu_v13_0_7_get_od_setting_limits(smu,
-+ PP_OD_FEATURE_FAN_ZERO_RPM,
++ PP_OD_FEATURE_FAN_ZERO_RPM_ENABLE,
+ &minimum,
+ &maximum);
+ if (input[0] < minimum ||
+ input[0] > maximum) {
-+ dev_info(adev->dev, "zero RPM setting(%ld) must be within [%d, %d]!\n",
++ dev_info(adev->dev, "zero RPM enable setting(%ld) must be within [%d, %d]!\n",
+ input[0], minimum, maximum);
+ return -EINVAL;
+ }
@@ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c: static void smu_v13_0_7_se
OD_OPS_SUPPORT_FAN_MINIMUM_PWM_RETRIEVE |
- OD_OPS_SUPPORT_FAN_MINIMUM_PWM_SET;
+ OD_OPS_SUPPORT_FAN_MINIMUM_PWM_SET |
-+ OD_OPS_SUPPORT_FAN_ZERO_RPM_RETRIEVE|
-+ OD_OPS_SUPPORT_FAN_ZERO_RPM_SET;
++ OD_OPS_SUPPORT_FAN_ZERO_RPM_ENABLE_RETRIEVE |
++ OD_OPS_SUPPORT_FAN_ZERO_RPM_ENABLE_SET;
}
static int smu_v13_0_7_set_default_od_settings(struct smu_context *smu)
-: --------- > 2: 6c2af6efb drm/amd/pm: add zero RPM stop temperature OD setting support for SMU13
--
2.47.0
