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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47687C00140 for ; Mon, 8 Aug 2022 08:39:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232223AbiHHIi7 (ORCPT ); Mon, 8 Aug 2022 04:38:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230127AbiHHIi6 (ORCPT ); Mon, 8 Aug 2022 04:38:58 -0400 Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AECCA55B0; Mon, 8 Aug 2022 01:38:56 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 79E3C5C006F; Mon, 8 Aug 2022 04:38:53 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 08 Aug 2022 04:38:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ljones.dev; h=cc :cc:content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm2; t=1659947933; x=1660034333; bh=zqjaDTRPpN d2Kx1hkomqQMG2U7vx1XaSDkqkLliNO30=; b=WJkqMIz9bcEmFrZ3B6vHnyGUAN WhOA9awUapl9k2O0bdH6WV7ZM6TJedUm4QqIxXNgAMVH78Evqp2vF6app8HE3nQn 0RxUx3KXO4Iq+obzp8eLo88bChLxjGjCUekI2cg6v/zdJUAKwLP3POwKst8iV+ca GxXoXMzSqTo16cue9ybkDq0Xmvy6EHAV/oAr+aeHlR9ak89JlHoZBEI9lesxB2Sq UOvYSMpns3AZLViEOk/t7ty/GZetyzxyoHZms2gm1uLkSdiBMsYfDlFQ+4N9zsyi UeZgc3RBg3yFF59jqQpK1hlO3tctv8P4/nIqd9tInjmgtHcifgj74epXQnFQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1659947933; x=1660034333; bh=zqjaDTRPpNd2Kx1hkomqQMG2U7vx 1XaSDkqkLliNO30=; b=uSXsmaorJahSOzI/vgc1VkKEOHs76rj9jSQl8axfhs0v Zfmy+JAomQKJ2t9F+cZsu5Zzr8sGa/vwuwnzkp0sDTDyCyswKVuphBkzdB5kB6f3 SL4fr2/Jd+WpyHT85XOLzlWpu4aiKsmZrahFiRcwyGrxHugI0+oPI8Pk9mImZILW U0tVUdWrQeznNxQAELCTJmU9fDjvsZEpJKJ19qBEyg487dYfbViQuWFrwZMDOFPm Ubv74/KN9pIkFjmZOs6xwu0cd9ubGbST4iaL5Y2hEpOZvwZBgSceYfr3d8AeWRhA r79sefiVmvj00wFrzPLpO1x3++mrhJ/m6cuK++U37Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdefkedgtdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffuvfevkfgjfhfogggtsehttd ertdertddvnecuhfhrohhmpefnuhhkvgculfhonhgvshcuoehluhhkvgeslhhjohhnvghs rdguvghvqeenucggtffrrghtthgvrhhnpedvvdegledtheefieejgfevgeefiefhtdevte efteduhfevtdefleethfetgeeludenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgr mhepmhgrihhlfhhrohhmpehluhhkvgeslhhjohhnvghsrdguvghv X-ME-Proxy: Feedback-ID: i5ec1447f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 8 Aug 2022 04:38:48 -0400 (EDT) Date: Mon, 08 Aug 2022 20:38:33 +1200 From: Luke Jones Subject: Re: [PATCH v2 6/6] asus-wmi: Add support for dGPU-only mode To: hdegoede@redhat.com Cc: markgross@kernel.org, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Message-Id: <90GAGR.D69M1ZE8ZLC21@ljones.dev> In-Reply-To: <20220808030420.8633-7-luke@ljones.dev> References: <20220808030420.8633-1-luke@ljones.dev> <20220808030420.8633-7-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: platform-driver-x86@vger.kernel.org It appears I have included the wrong dgpu-only patch. This one has mistakes in it and early testing... I will include the fixed one in the next version after review. Kind regards, Luke. On Mon, Aug 8 2022 at 15:04:20 +1200, Luke D. Jones wrote: > Adds support for a dGPU-only mode on some laptops where when enabled > the boot GPU is the dGPU, and the iGPU is not visible. > > Signed-off-by: Luke D. Jones > --- > .../ABI/testing/sysfs-platform-asus-wmi | 9 ++ > drivers/platform/x86/asus-wmi.c | 92 > +++++++++++++++++++ > include/linux/platform_data/x86/asus-wmi.h | 3 + > 3 files changed, 104 insertions(+) > > diff --git a/Documentation/ABI/testing/sysfs-platform-asus-wmi > b/Documentation/ABI/testing/sysfs-platform-asus-wmi > index 66b262476d92..93d111a65313 100644 > --- a/Documentation/ABI/testing/sysfs-platform-asus-wmi > +++ b/Documentation/ABI/testing/sysfs-platform-asus-wmi > @@ -77,6 +77,15 @@ Description: > * 0 - Disable, > * 1 - Enable, > > +What: /sys/devices/platform//dgpu_only > +Date: Aug 2022 > +KernelVersion: 6.0 > +Contact: "Luke Jones" > +Description: > + Set the dGPU to be the only GPU available: > + * 0 - Disable, > + * 1 - Enable, > + > What: /sys/devices/platform//panel_od > Date: Aug 2022 > KernelVersion: 5.17 > diff --git a/drivers/platform/x86/asus-wmi.c > b/drivers/platform/x86/asus-wmi.c > index b9e5d87e3e18..840299828512 100644 > --- a/drivers/platform/x86/asus-wmi.c > +++ b/drivers/platform/x86/asus-wmi.c > @@ -246,6 +246,9 @@ struct asus_wmi { > bool dgpu_disable_available; > bool dgpu_disable; > > + bool dgpu_only_available; > + bool dgpu_only; > + > bool keyboard_rgb_state_available; > bool keyboard_rgb_mode_available; > struct keyboard_rgb_led keyboard_rgb_mode; > @@ -750,6 +753,87 @@ static ssize_t egpu_enable_store(struct device > *dev, > > static DEVICE_ATTR_RW(egpu_enable); > > +/* dedicated GPU only > *********************************************************/ > +static int dgpu_only_check_present(struct asus_wmi *asus) > +{ > + u32 result; > + int err; > + > + asus->dgpu_only_available = false; > + > + err = asus_wmi_get_devstate(asus, ASUS_WMI_DEVID_DGPU, &result); > + if (err) { > + if (err == -ENODEV) > + return 0; > + return err; > + } > + > + if (result & ASUS_WMI_DSTS_PRESENCE_BIT) { > + asus->dgpu_only_available = true; > + asus->dgpu_only = result & ASUS_WMI_DSTS_STATUS_BIT; > + } > + > + return 0; > +} > + > +static int dgpu_only_write(struct asus_wmi *asus) > +{ > + u32 retval; > + u8 value; > + int err; > + > + /* Don't rely on type conversion */ > + value = asus->dgpu_only ? 1 : 0; > + > + err = asus_wmi_set_devstate(ASUS_WMI_DEVID_DGPU, value, &retval); > + if (err) { > + pr_warn("Failed to set dGPU-only mode: %d\n", err); > + return err; > + } > + > + if (retval > 1) { > + pr_warn("Failed to set dGPU-only mode (retval): 0x%x\n", retval); > + return -EIO; > + } > + > + sysfs_notify(&asus->platform_device->dev.kobj, NULL, "dgpu_only"); > + > + return 0; > +} > + > +static ssize_t dgpu_only_show(struct device *dev, > + struct device_attribute *attr, char *buf) > +{ > + struct asus_wmi *asus = dev_get_drvdata(dev); > + u8 mode = asus->dgpu_only; > + > + return sysfs_emit(buf, "%d\n", mode); > +} > + > +static ssize_t dgpu_only_store(struct device *dev, > + struct device_attribute *attr, > + const char *buf, size_t count) > +{ > + bool enable; > + int result; > + > + struct asus_wmi *asus = dev_get_drvdata(dev); > + > + result = kstrtobool(buf, &enable); > + if (result) > + return result; > + > + asus->dgpu_only = enable; > + > + result = dgpu_only_write(asus); > + if (result) > + return result; > + > + return count; > +} > + > +static DEVICE_ATTR_RW(dgpu_only); > + > /* TUF Laptop Keyboard RGB Modes > **********************************************/ > static int keyboard_rgb_mode_check_present(struct asus_wmi *asus) > { > @@ -3473,6 +3557,7 @@ static struct attribute *platform_attributes[] > = { > &dev_attr_touchpad.attr, > &dev_attr_egpu_enable.attr, > &dev_attr_dgpu_disable.attr, > + &dev_attr_dgpu_only.attr, > &dev_attr_keyboard_rgb_mode.attr, > &dev_attr_keyboard_rgb_mode_index.attr, > &dev_attr_keyboard_rgb_state.attr, > @@ -3507,6 +3592,8 @@ static umode_t asus_sysfs_is_visible(struct > kobject *kobj, > ok = asus->egpu_enable_available; > else if (attr == &dev_attr_dgpu_disable.attr) > ok = asus->dgpu_disable_available; > + else if (attr == &dev_attr_dgpu_only.attr) > + ok = asus->dgpu_only_available; > else if (attr == &dev_attr_keyboard_rgb_mode.attr) > ok = asus->keyboard_rgb_mode_available; > else if (attr == &dev_attr_keyboard_rgb_mode_index.attr) > @@ -3784,6 +3871,10 @@ static int asus_wmi_add(struct platform_device > *pdev) > if (err) > goto fail_dgpu_disable; > > + err = dgpu_only_check_present(asus); > + if (err) > + goto fail_dgpu_only; > + > err = keyboard_rgb_mode_check_present(asus); > if (err) > goto fail_keyboard_rgb_mode; > @@ -3906,6 +3997,7 @@ static int asus_wmi_add(struct platform_device > *pdev) > fail_fan_boost_mode: > fail_egpu_enable: > fail_dgpu_disable: > +fail_dgpu_only: > fail_keyboard_rgb_mode: > fail_keyboard_rgb_state: > fail_platform: > diff --git a/include/linux/platform_data/x86/asus-wmi.h > b/include/linux/platform_data/x86/asus-wmi.h > index b5c966798ef8..76b0756a0666 100644 > --- a/include/linux/platform_data/x86/asus-wmi.h > +++ b/include/linux/platform_data/x86/asus-wmi.h > @@ -98,6 +98,9 @@ > /* dgpu on/off */ > #define ASUS_WMI_DEVID_DGPU 0x00090020 > > +/* Dedicated GPU only. When active the dGPU will be the only visible > GPU */ > +#define ASUS_WMI_DEVID_DEDICATED 0x00090016 > + > /* TUF laptop RGB control */ > #define ASUS_WMI_DEVID_TUF_RGB_MODE 0x00100056 > /* TUF laptop RGB state control */ > -- > 2.37.1 >