From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EAEDC636CB for ; Sat, 17 Jul 2021 08:20:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 03C646128A for ; Sat, 17 Jul 2021 08:20:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231834AbhGQIXL (ORCPT ); Sat, 17 Jul 2021 04:23:11 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:36009 "EHLO wout3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230081AbhGQIXK (ORCPT ); Sat, 17 Jul 2021 04:23:10 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 88EFD3200936; Sat, 17 Jul 2021 04:20:13 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sat, 17 Jul 2021 04:20:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=v6OzhT ck7qlBSH9rFeZLKJcgjPKmwhli9kpu1otu68A=; b=WPiV3dcSNo1ndhBHOz94ri ummIvYzn8uR4bxkkQLcZsWY6sMuqWQVOBxKQARvraRbTovy9GiQ5/IL78dtZhSaw CzXqo0SIWiuGtPt4lh/4e8PJwkyE7IKPsWZDNQ2z6wARWhWwt12Rnr3u3MWUlhfj V18hzkkWRmQRwyiRlf7ByeNf7HcteXZzOTr+AaptNSYfUtoLP5u2fJ9Bi3b3F9TL bMWfUEbehH2Nkz61Mc71EKxyPb+0DBRWzAxOddUAnMmBaNYot/JrEigvYIM1Z/1E LLFNyRNKtENxFp/alqo226Olfgs1dtec9ySlbgO1ObAmq1yHt7K6eeMKciij/9Ng == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrvdeggdejgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepfffhuffvkfgjfhfogggtsehttdertd ertddvnecuhfhrohhmpefnuhhkvgculfhonhgvshcuoehluhhkvgeslhhjohhnvghsrdgu vghvqeenucggtffrrghtthgvrhhnpefgfeefudffhffgueehgeffffeggeevieefueethf eijefftedugfeuveethedtteenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhep mhgrihhlfhhrohhmpehluhhkvgeslhhjohhnvghsrdguvghv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 17 Jul 2021 04:20:07 -0400 (EDT) Date: Sat, 17 Jul 2021 20:19:54 +1200 From: Luke Jones Subject: Re: [PATCH 3/4] asus-wmi: Add egpu enable method To: hdegoede@redhat.com Cc: pobrn@protonmail.com, mgross@linux.intel.com, corentin.chary@gmail.com, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, acpi4asus-user@lists.sourceforge.net Message-Id: <65RDWQ.DNBXEUQTBV352@ljones.dev> In-Reply-To: References: <20210717081323.7925-1-luke@ljones.dev> <20210717081323.7925-3-luke@ljones.dev> X-Mailer: geary/40.0 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Damn. I thought `-v2` on `git send-email` would bump patch version too. What is the correct way to do that for a full patch sequence? On Sat, Jul 17 2021 at 20:15:30 +1200, Luke Jones wrote: > Apologies, I forgot that the patches contain sequence. There is > actually no 4th patch (the patch itself was already upstreamed). > > Sincere regards, > Luke. > > On Sat, Jul 17 2021 at 20:13:23 +1200, Luke D. Jones > wrote: >> The X13 Flow laptops can utilise an external GPU. This requires >> toggling an ACPI method which will first disable the internal >> dGPU, and then enable the eGPU. >> >> Signed-off-by: Luke D. Jones >> --- >> drivers/platform/x86/asus-wmi.c | 91 >> ++++++++++++++++++++++ >> include/linux/platform_data/x86/asus-wmi.h | 3 + >> 2 files changed, 94 insertions(+) >> >> diff --git a/drivers/platform/x86/asus-wmi.c >> b/drivers/platform/x86/asus-wmi.c >> index 02762a60d27a..ee5d8656641e 100644 >> --- a/drivers/platform/x86/asus-wmi.c >> +++ b/drivers/platform/x86/asus-wmi.c >> @@ -210,6 +210,9 @@ struct asus_wmi { >> u8 fan_boost_mode_mask; >> u8 fan_boost_mode; >> >> + bool egpu_enable_available; // 0 = enable >> + bool egpu_enable; >> + >> bool dgpu_disable_available; >> bool dgpu_disable; >> >> @@ -430,6 +433,86 @@ static void >> lid_flip_tablet_mode_get_state(struct asus_wmi *asus) >> } >> } >> >> +/* eGPU >> ********************************************************************/ >> +static int egpu_enable_check_present(struct asus_wmi *asus) >> +{ >> + u32 result; >> + int err; >> + >> + asus->egpu_enable_available = false; >> + >> + err = asus_wmi_get_devstate(asus, ASUS_WMI_DEVID_EGPU, &result); >> + if (err) { >> + if (err == -ENODEV) >> + return 0; >> + return err; >> + } >> + >> + if (result & ASUS_WMI_DSTS_PRESENCE_BIT) { >> + asus->egpu_enable_available = true; >> + asus->egpu_enable = result & ASUS_WMI_DSTS_STATUS_BIT; >> + } >> + >> + return 0; >> +} >> + >> +static int egpu_enable_write(struct asus_wmi *asus) >> +{ >> + int err; >> + u8 value; >> + u32 retval; >> + >> + value = asus->egpu_enable; >> + >> + err = asus_wmi_set_devstate(ASUS_WMI_DEVID_EGPU, value, &retval); >> + >> + if (err) { >> + pr_warn("Failed to set egpu disable: %d\n", err); >> + return err; >> + } >> + >> + if (retval > 1 || retval < 0) { >> + pr_warn("Failed to set egpu disable (retval): 0x%x\n", retval); >> + return -EIO; >> + } >> + >> + sysfs_notify(&asus->platform_device->dev.kobj, NULL, >> "egpu_enable"); >> + >> + return 0; >> +} >> + >> +static ssize_t egpu_enable_show(struct device *dev, >> + struct device_attribute *attr, char *buf) >> +{ >> + struct asus_wmi *asus = dev_get_drvdata(dev); >> + bool mode = asus->egpu_enable; >> + >> + return sysfs_emit(buf, "%d\n", mode); >> +} >> + >> +static ssize_t egpu_enable_store(struct device *dev, >> + struct device_attribute *attr, >> + const char *buf, size_t count) >> +{ >> + int result; >> + bool disable; >> + struct asus_wmi *asus = dev_get_drvdata(dev); >> + >> + result = kstrtobool(buf, &disable); >> + if (result == -EINVAL) >> + return result; >> + >> + asus->egpu_enable = disable; >> + >> + result = egpu_enable_write(asus); >> + if (result != 0) >> + return result; >> + >> + return count; >> +} >> + >> +static DEVICE_ATTR_RW(egpu_enable); >> + >> /* dGPU >> ********************************************************************/ >> static int dgpu_disable_check_present(struct asus_wmi *asus) >> { >> @@ -2502,6 +2585,7 @@ static struct attribute *platform_attributes[] >> = { >> &dev_attr_camera.attr, >> &dev_attr_cardr.attr, >> &dev_attr_touchpad.attr, >> + &dev_attr_egpu_enable.attr, >> &dev_attr_dgpu_disable.attr, >> &dev_attr_lid_resume.attr, >> &dev_attr_als_enable.attr, >> @@ -2529,6 +2613,8 @@ static umode_t asus_sysfs_is_visible(struct >> kobject *kobj, >> devid = ASUS_WMI_DEVID_LID_RESUME; >> else if (attr == &dev_attr_als_enable.attr) >> devid = ASUS_WMI_DEVID_ALS_ENABLE; >> + else if (attr == &dev_attr_egpu_enable.attr) >> + ok = asus->egpu_enable_available; >> else if (attr == &dev_attr_dgpu_disable.attr) >> ok = asus->dgpu_disable_available; >> else if (attr == &dev_attr_fan_boost_mode.attr) >> @@ -2792,6 +2878,10 @@ static int asus_wmi_add(struct >> platform_device *pdev) >> if (err) >> goto fail_platform; >> >> + err = egpu_enable_check_present(asus); >> + if (err) >> + goto fail_egpu_enable; >> + >> err = dgpu_disable_check_present(asus); >> if (err) >> goto fail_dgpu_disable; >> @@ -2896,6 +2986,7 @@ static int asus_wmi_add(struct platform_device >> *pdev) >> fail_sysfs: >> fail_throttle_thermal_policy: >> fail_fan_boost_mode: >> +fail_egpu_enable: >> fail_dgpu_disable: >> fail_platform: >> fail_panel_od: >> diff --git a/include/linux/platform_data/x86/asus-wmi.h >> b/include/linux/platform_data/x86/asus-wmi.h >> index a528f9d0e4b7..17dc5cb6f3f2 100644 >> --- a/include/linux/platform_data/x86/asus-wmi.h >> +++ b/include/linux/platform_data/x86/asus-wmi.h >> @@ -90,6 +90,9 @@ >> /* Keyboard dock */ >> #define ASUS_WMI_DEVID_KBD_DOCK 0x00120063 >> >> +/* dgpu on/off */ >> +#define ASUS_WMI_DEVID_EGPU 0x00090019 >> + >> /* dgpu on/off */ >> #define ASUS_WMI_DEVID_DGPU 0x00090020 >> >> -- >> 2.31.1 >> >