On Sun, 10 Mar 2024, Luke D. Jones wrote:
> Adds support for a second TUF RGB wmi call that some versions of the TUF
> laptop come with. Also adjusts existing support to select whichever is
> available.
>
> Signed-off-by: Luke D. Jones <luke@xxxxxxxxxx>
> ---
> drivers/platform/x86/asus-wmi.c | 12 +++++++++++-
> include/linux/platform_data/x86/asus-wmi.h | 1 +
> 2 files changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
> index 2cf695289655..ca8c73c15fcc 100644
> --- a/drivers/platform/x86/asus-wmi.c
> +++ b/drivers/platform/x86/asus-wmi.c
> @@ -280,6 +280,7 @@ struct asus_wmi {
> bool nv_temp_tgt_available;
>
> bool kbd_rgb_mode_available;
> + u32 kbd_rgb_dev;
> bool kbd_rgb_state_available;
>
> bool throttle_thermal_policy_available;
> @@ -870,6 +871,7 @@ static ssize_t kbd_rgb_mode_store(struct device *dev,
> struct device_attribute *attr,
> const char *buf, size_t count)
> {
> + struct asus_wmi *asus = dev_get_drvdata(dev);
> u32 cmd, mode, r, g, b, speed;
> int err;
>
> @@ -906,7 +908,7 @@ static ssize_t kbd_rgb_mode_store(struct device *dev,
> speed = 0xeb;
> }
>
> - err = asus_wmi_evaluate_method3(ASUS_WMI_METHODID_DEVS, ASUS_WMI_DEVID_TUF_RGB_MODE,
> + err = asus_wmi_evaluate_method3(ASUS_WMI_METHODID_DEVS, asus->kbd_rgb_dev,
> cmd | (mode << 8) | (r << 16) | (g << 24), b | (speed << 8), NULL);
> if (err)
> return err;
> @@ -4537,6 +4539,14 @@ static int asus_wmi_add(struct platform_device *pdev)
> asus->gpu_mux_dev = ASUS_WMI_DEVID_GPU_MUX_VIVO;
> }
>
> + if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE)) {
> + asus->kbd_rgb_mode_available = true;
> + asus->kbd_rgb_dev = ASUS_WMI_DEVID_TUF_RGB_MODE;
> + } else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE2)) {
> + asus->kbd_rgb_mode_available = true;
> + asus->kbd_rgb_dev = ASUS_WMI_DEVID_TUF_RGB_MODE2;
> + }
Hi,
Why are you leaving this line there (unlike in the GPU MUX patch where
you replaced it with the similar if()s as above):
asus->kbd_rgb_mode_available = asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_MODE);
?
--
i.
