Commit cfffd980 authored by Wolfgang Müller's avatar Wolfgang Müller Committed by Alex Deucher
Browse files

drm/amd/pm: add zero RPM OD setting support for SMU13 

Whilst we have support for setting fan curves there is no support for
disabling the zero RPM feature. Since the relevant bits are already
present in the OverDriveTable, hook them up to a sysctl setting so users
can influence this behaviour.

Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3489


Reviewed-by: default avatarKenneth Feng <kenneth.feng@amd.com>
Signed-off-by: default avatarWolfgang Müller <wolf@oriole.systems>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8cc438be

Documentation/gpu/amdgpu/thermal.rst

+6 −0
Original line number Diff line number Diff line
@@ -100,6 +100,12 @@ fan_minimum_pwm 
.. kernel-doc:: drivers/gpu/drm/amd/pm/amdgpu_pm.c

   :doc: fan_minimum_pwm



fan_zero_rpm_enable

----------------------



.. kernel-doc:: drivers/gpu/drm/amd/pm/amdgpu_pm.c

   :doc: fan_zero_rpm_enable



GFXOFF

======

drivers/gpu/drm/amd/include/kgd_pp_interface.h

+2 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ enum pp_clock_type { 
	OD_ACOUSTIC_TARGET,

	OD_FAN_TARGET_TEMPERATURE,

	OD_FAN_MINIMUM_PWM,

	OD_FAN_ZERO_RPM_ENABLE,

};



enum amd_pp_sensors {
@@ -199,6 +200,7 @@ 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_ENABLE,

};



struct pp_states_info {

drivers/gpu/drm/amd/pm/amdgpu_pm.c

+62 −0
Original line number Diff line number Diff line
@@ -4109,6 +4109,60 @@ static umode_t fan_minimum_pwm_visible(struct amdgpu_device *adev) 
	return umode;

}



/**

 * DOC: fan_zero_rpm_enable

 *

 * The amdgpu driver provides a sysfs API for checking and adjusting the

 * zero RPM feature.

 *

 * Reading back the file shows you the current setting and the permitted

 * ranges if changable.

 *

 * Writing an integer to the file, change the setting accordingly.

 *

 * When you have finished the editing, write "c" (commit) to the file to commit

 * your changes.

 *

 * If you want to reset to the default value, write "r" (reset) to the file to

 * reset them.

 */

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_ENABLE, buf);

}



static ssize_t fan_zero_rpm_enable_store(struct kobject *kobj,

					    struct kobj_attribute *attr,

					    const char *buf,

					    size_t count)

{

	struct od_kobj *container = container_of(kobj, struct od_kobj, kobj);

	struct amdgpu_device *adev = (struct amdgpu_device *)container->priv;



	return (ssize_t)amdgpu_distribute_custom_od_settings(adev,

							     PP_OD_EDIT_FAN_ZERO_RPM_ENABLE,

							     buf,

							     count);

}



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_ENABLE_RETRIEVE)

		umode |= S_IRUSR | S_IRGRP | S_IROTH;



	if (adev->pm.od_feature_mask & OD_OPS_SUPPORT_FAN_ZERO_RPM_ENABLE_SET)

		umode |= S_IWUSR;



	return umode;

}



static struct od_feature_set amdgpu_od_set = {

	.containers = {

		[0] = {
@@ -4154,6 +4208,14 @@ static struct od_feature_set amdgpu_od_set = { 
						.store = fan_minimum_pwm_store,

					},

				},

				[5] = {

					.name = "fan_zero_rpm_enable",

					.ops = {

						.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

+2 −0
Original line number Diff line number Diff line
@@ -328,6 +328,8 @@ 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_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

+2 −0
Original line number Diff line number Diff line
@@ -2895,6 +2895,8 @@ static enum smu_clk_type smu_convert_to_smuclk(enum pp_clock_type type) 
		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_ENABLE:

		clk_type = SMU_OD_FAN_ZERO_RPM_ENABLE; break;

	default:

		clk_type = SMU_CLK_COUNT; break;

	}