mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andrei Sabalenka <mechakotik@gmail.com>
To: corentin.chary@gmail.com, hdegoede@redhat.com,
	ilpo.jarvinen@linux.intel.com,
	acpi4asus-user@lists.sourceforge.net,
	platform-driver-x86@vger.kernel.org,
	linux-kernel@vger.kernel.org, mechakotik@gmail.com
Subject: [PATCH] platform/x86: asus-wmi: Re-enable custom fan curves after setting throttle_thermal_policy
Date: Mon, 15 Jan 2024 15:22:17 +0300	[thread overview]
Message-ID: <20240115122315.10250-1-mechakotik@gmail.com> (raw)

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


             reply	other threads:[~2024-01-15 12:23 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-15 12:22 Andrei Sabalenka [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240115122315.10250-1-mechakotik@gmail.com \
    --to=mechakotik@gmail.com \
    --cc=acpi4asus-user@lists.sourceforge.net \
    --cc=corentin.chary@gmail.com \
    --cc=hdegoede@redhat.com \
    --cc=ilpo.jarvinen@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=platform-driver-x86@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®