public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] platform/x86: asus-wmi: Re-enable custom fan curves after setting throttle_thermal_policy
@ 2024-01-15 12:22 Andrei Sabalenka
  2024-01-15 12:38 ` Hans de Goede
  0 siblings, 1 reply; 7+ messages in thread
From: Andrei Sabalenka @ 2024-01-15 12:22 UTC (permalink / raw)
  To: corentin.chary, hdegoede, ilpo.jarvinen, acpi4asus-user,
	platform-driver-x86, linux-kernel, mechakotik

When changing throttle_thermal_policy, all the custom fan curves are getting disabled. This patch re-enables all the custom fan curves that were enabled before changing throttle_thermal_policy.

I believe it makes asus-wmi sysfs interface more convenient, as it allows userspace to manage fan curves independently from platform_profile and throttle_thermal_policy. At the kernel level, custom fan curves should not be tied to "power profiles" scheme in any way, as it gives the user less freedom of controlling them.

Signed-off-by: Andrei Sabalenka <mechakotik@gmail.com>
---
 drivers/platform/x86/asus-wmi.c | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 18be35fdb..c2e38f6d8 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -3441,13 +3441,28 @@ static int throttle_thermal_policy_write(struct asus_wmi *asus)
 		return -EIO;
 	}
 
-	/* Must set to disabled if mode is toggled */
-	if (asus->cpu_fan_curve_available)
-		asus->custom_fan_curves[FAN_CURVE_DEV_CPU].enabled = false;
-	if (asus->gpu_fan_curve_available)
-		asus->custom_fan_curves[FAN_CURVE_DEV_GPU].enabled = false;
-	if (asus->mid_fan_curve_available)
-		asus->custom_fan_curves[FAN_CURVE_DEV_MID].enabled = false;
+	/* Re-enable fan curves after profile change */
+	if (asus->cpu_fan_curve_available && asus->custom_fan_curves[FAN_CURVE_DEV_CPU].enabled) {
+		err = fan_curve_write(asus, &asus->custom_fan_curves[FAN_CURVE_DEV_CPU]);
+		if (err) {
+			pr_warn("Failed to re-enable CPU fan curve: %d\n", err);
+			return err;
+		}
+	}
+	if (asus->gpu_fan_curve_available && asus->custom_fan_curves[FAN_CURVE_DEV_GPU].enabled) {
+		err = fan_curve_write(asus, &asus->custom_fan_curves[FAN_CURVE_DEV_GPU]);
+		if (err) {
+			pr_warn("Failed to re-enable GPU fan curve: %d\n", err);
+			return err;
+		}
+	}
+	if (asus->mid_fan_curve_available && asus->custom_fan_curves[FAN_CURVE_DEV_MID].enabled) {
+		err = fan_curve_write(asus, &asus->custom_fan_curves[FAN_CURVE_DEV_MID]);
+		if (err) {
+			pr_warn("Failed to re-enable MID fan curve: %d\n", err);
+			return err;
+		}
+	}
 
 	return 0;
 }
-- 
2.43.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2024-01-22 10:53 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-15 12:22 [PATCH] platform/x86: asus-wmi: Re-enable custom fan curves after setting throttle_thermal_policy Andrei Sabalenka
2024-01-15 12:38 ` Hans de Goede
2024-01-15 20:25   ` Luke Jones
2024-01-16 10:25     ` Hans de Goede
2024-01-16 11:24       ` Andrei Sabalenka
2024-01-16 19:43       ` Luke Jones
2024-01-22 10:53         ` Hans de Goede

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox