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 1E82AC4167B for ; Tue, 28 Nov 2023 21:13:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346803AbjK1VNU (ORCPT ); Tue, 28 Nov 2023 16:13:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346806AbjK1VMm (ORCPT ); Tue, 28 Nov 2023 16:12:42 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5BBF23852 for ; Tue, 28 Nov 2023 13:09:30 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F434C433B9; Tue, 28 Nov 2023 21:09:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701205770; bh=iYS5R2sEAUWcUJ4irfOImBV6OzZrQINJIReZ13xLvXg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DWKwpC3o6kweIMDZTgseV7bZ6iWf6ySz9sVwwxm2e/1llrKgUnrv2xcUoxR6Bkh/f 4X0sX4KC8eEtVFlDFk4Rm9n3268DY+ki1/wF/JeqPFR4sem13LiOWEtpH0EpAxqEeY 5W/GYdsL25OKKs5v6QZ+jOj0xbQ7JCvWfVJNSUlhcpC1EpClRNBG/JCG+lD5ki87iL v5A/FYhONozcGBxH4ZW+3sDdHWmOd2uOOP4GgV/Q83WWbBYMP5ax5kEkxszZ6c4zWH Y4HbE2TYfFVWtpF4y+69Vt1A5H6mh+W8IAadBmTxA+Mo3tSxHBJHkBz9g0/XXd3gnu jeiaEFchqy/wA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Denis Benato , "Luke D . Jones" , Jiri Kosina , Sasha Levin , jikos@kernel.org, benjamin.tissoires@redhat.com, linux-input@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 10/13] HID: hid-asus: reset the backlight brightness level on resume Date: Tue, 28 Nov 2023 16:09:04 -0500 Message-ID: <20231128210914.876813-10-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231128210914.876813-1-sashal@kernel.org> References: <20231128210914.876813-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.202 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Denis Benato [ Upstream commit 546edbd26cff7ae990e480a59150e801a06f77b1 ] Some devices managed by this driver automatically set brightness to 0 before entering a suspended state and reset it back to a default brightness level after the resume: this has the effect of having the kernel report wrong brightness status after a sleep, and on some devices (like the Asus RC71L) that brightness is the intensity of LEDs directly facing the user. Fix the above issue by setting back brightness to the level it had before entering a sleep state. Signed-off-by: Denis Benato Signed-off-by: Luke D. Jones Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- drivers/hid/hid-asus.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index 6865cab33cf8a..52b0ef99bc955 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -901,6 +901,24 @@ static int asus_start_multitouch(struct hid_device *hdev) return 0; } +static int __maybe_unused asus_resume(struct hid_device *hdev) { + struct asus_drvdata *drvdata = hid_get_drvdata(hdev); + int ret = 0; + + if (drvdata->kbd_backlight) { + const u8 buf[] = { FEATURE_KBD_REPORT_ID, 0xba, 0xc5, 0xc4, + drvdata->kbd_backlight->cdev.brightness }; + ret = asus_kbd_set_report(hdev, buf, sizeof(buf)); + if (ret < 0) { + hid_err(hdev, "Asus failed to set keyboard backlight: %d\n", ret); + goto asus_resume_err; + } + } + +asus_resume_err: + return ret; +} + static int __maybe_unused asus_reset_resume(struct hid_device *hdev) { struct asus_drvdata *drvdata = hid_get_drvdata(hdev); @@ -1177,6 +1195,7 @@ static struct hid_driver asus_driver = { .input_configured = asus_input_configured, #ifdef CONFIG_PM .reset_resume = asus_reset_resume, + .resume = asus_resume, #endif .event = asus_event, .raw_event = asus_raw_event -- 2.42.0