From nobody Sun Feb 8 16:14:21 2026 Received: from fout-a6-smtp.messagingengine.com (fout-a6-smtp.messagingengine.com [103.168.172.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 456794690; Sun, 25 May 2025 20:42:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.149 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748205751; cv=none; b=QQ9TW8ns6220kpNwwlbmtNoRaiJc1aYbB1kVli6j5AtF8JiP+IqMtnhAYssYYhI3zn187SN6KjYBULFe6CsAfu3WtQ06Q9R/Q3AOQEoPezC2/f8sCuaO6WcbhrukCevVCf12m4YA9cnhOezrddUUi1raM9in6qp0uNlsjv9Sq68= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748205751; c=relaxed/simple; bh=pG3DksZ5niG3gPjDO8DVTQsOM39xmHZzz6PDFj4VTiM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=WDER3j80bsPf4PFwoYH2DfIBrKhYf1kJmjpLrdsIlY8SWaiTXjsmEED4KWhmHx9r0/dH0ur91Fdpzh6YOvctPoTus9tt24iisafDd0rEQBnj+Y482iAn+gYh+5npqTlEZZdquucIj/jfgVvn+1URJ6bw5PKFFNrGA8ejX6GJtjI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev; spf=none smtp.mailfrom=ljones.dev; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b=UuzPDkAV; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=kJTlPubK; arc=none smtp.client-ip=103.168.172.149 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=ljones.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b="UuzPDkAV"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="kJTlPubK" Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfout.phl.internal (Postfix) with ESMTP id 230251380452; Sun, 25 May 2025 16:42:27 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-06.internal (MEProxy); Sun, 25 May 2025 16:42:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ljones.dev; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm2; t=1748205747; x=1748292147; bh=nC/xhqrsPKfreoD8yVsiD 635NRVSdwJZuhOTWVC02Hs=; b=UuzPDkAVxEikR7HTVqbdaLvhGsKOnk3x0kedP XoP+1zyQeRuTzxgdbudFETSwV0SBMMlR8AhMXPkIlbTCuYmObheMQ+hnkM0V5lFv 6/znnJoyG9daHEZZwFAIveOc4TehwOD+foKJy/Ug1X76v7P83KsSmYUj33MBtQzf 2Tr46fKBBVw5kkCkou5icdQKZgJmX3mP4Y5sWEtaPj75n4Zis2PLkknbZTkTKvfg HU+fsijmhzDrg+2ZVeCjSyhJalUtMz/NfSQ1lId5qKCrE9U+xFLIG9Thp3p0/k8p WLKaqjS0viMJX3irV4siM/cM5BwFFePBoXzMW7ki31zRcxUtA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1748205747; x=1748292147; bh=nC/xhqrsPKfreoD8yVsiD635NRVSdwJZuhO TWVC02Hs=; b=kJTlPubKefr+MV11QnFysPTK8C5mUOCcTRDHqEgiaNLEGL5r9lN DmNub2ODfi0uK9KbqtAHoySmZ0i0J93XicX2qRY9jU6KVCsZHVcFmBn0YBcC4nVI JSGmvXzwyy76xt9/cXjaP8Q1jsqoyRSbyQsQy1htK1hUy6mRGzhlmj0pRVQrKYza xp/oLkowVFg/M4YX2v+t2SdCs9UVDBZbvKYjsl0LQfrKYnv9uWFy8P3M9QzLq4Cn T5pYF1UYK+irC4gnW7ojv83LtKaoY41f/ffEvL4rxe387HQxyU9YxG9/++w3fbAn dDWlWEF78objipWtfMlTDd4eK3NaYRScVqw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtddtgdduheeitdculddtuddrgeefvddrtd dtmdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggft fghnshhusghstghrihgsvgdpuffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftd dtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomhepnfhu khgvucflohhnvghsuceolhhukhgvsehljhhonhgvshdruggvvheqnecuggftrfgrthhtvg hrnheptdektdeitdetueehueetteffffeggfefhfeitddvgeeifeejheelheffjefggfeh necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhhukh gvsehljhhonhgvshdruggvvhdpnhgspghrtghpthhtohephedpmhhouggvpehsmhhtphho uhhtpdhrtghpthhtoheplhhinhhugidqkhgvrhhnvghlsehvghgvrhdrkhgvrhhnvghlrd horhhgpdhrtghpthhtohephhguvghgohgvuggvsehrvgguhhgrthdrtghomhdprhgtphht thhopehilhhpohdrjhgrrhhvihhnvghnsehlihhnuhigrdhinhhtvghlrdgtohhmpdhrtg hpthhtohepphhlrghtfhhorhhmqdgurhhivhgvrhdqgiekieesvhhgvghrrdhkvghrnhgv lhdrohhrghdprhgtphhtthhopehluhhkvgeslhhjohhnvghsrdguvghv X-ME-Proxy: Feedback-ID: i5ec1447f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 25 May 2025 16:42:25 -0400 (EDT) From: Luke Jones To: linux-kernel@vger.kernel.org Cc: hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com, platform-driver-x86@vger.kernel.org, Luke Jones Subject: [PATCH] asus-wmi: fixup screenpad brightness Date: Sun, 25 May 2025 22:42:14 +0200 Message-ID: <20250525204214.104030-1-luke@ljones.dev> X-Mailer: git-send-email 2.49.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fix up some inconsistent behaviour involving the screenpad on some ASUS laptops. This fixes: - illogical screen off control (0/1 flipped depending on WMI state) - bad brightness depending on the last screenpad power state - incorrect brightness scaling Signed-off-by: Luke Jones --- drivers/platform/x86/asus-wmi.c | 52 +++++++++++++-------------------- 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wm= i.c index f52884e90759..cec509171971 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -123,7 +123,6 @@ module_param(fnlock_default, bool, 0444); #define NVIDIA_TEMP_MIN 75 #define NVIDIA_TEMP_MAX 87 =20 -#define ASUS_SCREENPAD_BRIGHT_MIN 20 #define ASUS_SCREENPAD_BRIGHT_MAX 255 #define ASUS_SCREENPAD_BRIGHT_DEFAULT 60 =20 @@ -4239,43 +4238,37 @@ static int read_screenpad_brightness(struct backlig= ht_device *bd) return err; /* The device brightness can only be read if powered, so return stored */ if (err =3D=3D BACKLIGHT_POWER_OFF) - return asus->driver->screenpad_brightness - ASUS_SCREENPAD_BRIGHT_MIN; + return bd->props.brightness; =20 err =3D asus_wmi_get_devstate(asus, ASUS_WMI_DEVID_SCREENPAD_LIGHT, &retv= al); if (err < 0) return err; =20 - return (retval & ASUS_WMI_DSTS_BRIGHTNESS_MASK) - ASUS_SCREENPAD_BRIGHT_M= IN; + return (retval & ASUS_WMI_DSTS_BRIGHTNESS_MASK); } =20 static int update_screenpad_bl_status(struct backlight_device *bd) { - struct asus_wmi *asus =3D bl_get_data(bd); - int power, err =3D 0; + int err =3D 0; u32 ctrl_param; =20 - power =3D read_screenpad_backlight_power(asus); - if (power < 0) - return power; - - if (bd->props.power !=3D power) { - if (power !=3D BACKLIGHT_POWER_ON) { - /* Only brightness > 0 can power it back on */ - ctrl_param =3D asus->driver->screenpad_brightness - ASUS_SCREENPAD_BRIG= HT_MIN; - err =3D asus_wmi_set_devstate(ASUS_WMI_DEVID_SCREENPAD_LIGHT, - ctrl_param, NULL); - } else { - err =3D asus_wmi_set_devstate(ASUS_WMI_DEVID_SCREENPAD_POWER, 0, NULL); - } - } else if (power =3D=3D BACKLIGHT_POWER_ON) { - /* Only set brightness if powered on or we get invalid/unsync state */ - ctrl_param =3D bd->props.brightness + ASUS_SCREENPAD_BRIGHT_MIN; + ctrl_param =3D bd->props.brightness; + if (ctrl_param >=3D 0 && bd->props.power) { + err =3D asus_wmi_set_devstate(ASUS_WMI_DEVID_SCREENPAD_POWER, 1, + NULL); + if (err < 0) + return err; + ctrl_param =3D bd->props.brightness; err =3D asus_wmi_set_devstate(ASUS_WMI_DEVID_SCREENPAD_LIGHT, ctrl_param= , NULL); + if (err < 0) + return err; } =20 - /* Ensure brightness is stored to turn back on with */ - if (err =3D=3D 0) - asus->driver->screenpad_brightness =3D bd->props.brightness + ASUS_SCREE= NPAD_BRIGHT_MIN; + if (!bd->props.power) { + err =3D asus_wmi_set_devstate(ASUS_WMI_DEVID_SCREENPAD_POWER, 0, NULL); + if (err < 0) + return err; + } =20 return err; } @@ -4293,22 +4286,19 @@ static int asus_screenpad_init(struct asus_wmi *asu= s) int err, power; int brightness =3D 0; =20 - power =3D read_screenpad_backlight_power(asus); + power =3D asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_SCREENPAD_POW= ER); if (power < 0) return power; =20 - if (power !=3D BACKLIGHT_POWER_OFF) { + if (power) { err =3D asus_wmi_get_devstate(asus, ASUS_WMI_DEVID_SCREENPAD_LIGHT, &bri= ghtness); if (err < 0) return err; } - /* default to an acceptable min brightness on boot if too low */ - if (brightness < ASUS_SCREENPAD_BRIGHT_MIN) - brightness =3D ASUS_SCREENPAD_BRIGHT_DEFAULT; =20 memset(&props, 0, sizeof(struct backlight_properties)); props.type =3D BACKLIGHT_RAW; /* ensure this bd is last to be picked */ - props.max_brightness =3D ASUS_SCREENPAD_BRIGHT_MAX - ASUS_SCREENPAD_BRIGH= T_MIN; + props.max_brightness =3D ASUS_SCREENPAD_BRIGHT_MAX; bd =3D backlight_device_register("asus_screenpad", &asus->platform_device->dev, asus, &asus_screenpad_bl_ops, &props); @@ -4319,7 +4309,7 @@ static int asus_screenpad_init(struct asus_wmi *asus) =20 asus->screenpad_backlight_device =3D bd; asus->driver->screenpad_brightness =3D brightness; - bd->props.brightness =3D brightness - ASUS_SCREENPAD_BRIGHT_MIN; + bd->props.brightness =3D brightness; bd->props.power =3D power; backlight_update_status(bd); =20 --=20 2.49.0