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 C5405C433F5 for ; Mon, 10 Oct 2022 07:41:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231845AbiJJHla (ORCPT ); Mon, 10 Oct 2022 03:41:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232043AbiJJHkX (ORCPT ); Mon, 10 Oct 2022 03:40:23 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 722B968897 for ; Mon, 10 Oct 2022 00:36:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665387368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7ZhbNdDQmabS5XbSWhEVzgU/+svirWDCssVVR9HyNuE=; b=SNhHb94ihfI5wXy5X93D8ehgY9qFqKJThbuSW5/IjZnXxmRnrY6YlETYKbTeWHYlGHQZ2a zJ3WPQrb837zezarfTeAAqqA9ld3d3DxZ8v7egl2T/gQ6TSK3cH8ACUUFf0hdnlxtYCFY7 ZT6p2FIckCePJ7tJXwbe1bsBoOX/EpI= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-442-Eu_WVkcaNaSrDiRc4hl39g-1; Mon, 10 Oct 2022 03:36:07 -0400 X-MC-Unique: Eu_WVkcaNaSrDiRc4hl39g-1 Received: by mail-ed1-f70.google.com with SMTP id z16-20020a05640235d000b0045c0360bfcfso1977691edc.14 for ; Mon, 10 Oct 2022 00:36:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=7ZhbNdDQmabS5XbSWhEVzgU/+svirWDCssVVR9HyNuE=; b=ygEcnFiTWJ6CyzGTxxfDeEcY2JdxLx/1K24yWhVSSrjcrWgnITV/IpC8PyM4t0iKdX aPrbMU2QQqgGzgI/+Drm2V2suE+dxTd4YE6rZtpOg24DlmY5bz010oQmNt9r2UbkNNIm fqI3PFoA3vExIzs/yDTTOJ61t113Wzis80GoggO8ZzHo8Lu5++w2U0JV8+ZbVNCranUU LThOU2JYsEn1MCXJLux/uscyLJGDbfNjbaNUT7/2EkaN3Za+1d9BGC9L3aiCXeMzt511 3GHB2la69b7tEg3hmYc7Vcm2b7lAHVhvVykknvyYNI5F35o07t8ErFRYM3JZgmh5TFzC LpAA== X-Gm-Message-State: ACrzQf2rEPpy/oHrsi1ER+Lgij57HvnBHLfKNvOTeBMt8b0ZgWc13qwc G0PdJk4Kc75Sc2XqErYu46y5nVgZ0E26Ksmuo7nTIBHFoT46UYHV9wRjbR60Ma+Y0RavEdn+kzz cExnKibPAo5JvXyrndTgV9Q== X-Received: by 2002:a17:907:1b22:b0:741:8809:b4e6 with SMTP id mp34-20020a1709071b2200b007418809b4e6mr13751282ejc.84.1665387365974; Mon, 10 Oct 2022 00:36:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Jkszl54/vvzO2+JMgaSmx1C3gbxvwRcW/1bX7R3pOIGUZHlbDxb7pKNRbXyPhdJOCQbDNMw== X-Received: by 2002:a17:907:1b22:b0:741:8809:b4e6 with SMTP id mp34-20020a1709071b2200b007418809b4e6mr13751265ejc.84.1665387365695; Mon, 10 Oct 2022 00:36:05 -0700 (PDT) Received: from [10.40.98.142] ([78.108.130.194]) by smtp.gmail.com with ESMTPSA id ch2-20020a170906c2c200b0073d7ab84375sm4940333ejb.92.2022.10.10.00.36.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 Oct 2022 00:36:05 -0700 (PDT) Message-ID: Date: Mon, 10 Oct 2022 09:36:04 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.1 Subject: Re: [PATCH AUTOSEL 5.15 13/25] ACPI: video: Change disable_backlight_sysfs_if quirks to acpi_backlight=native Content-Language: en-US To: Sasha Levin , linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Rafael J . Wysocki" , Arvid Norlander , rafael@kernel.org, linux-acpi@vger.kernel.org References: <20221009235426.1231313-1-sashal@kernel.org> <20221009235426.1231313-13-sashal@kernel.org> From: Hans de Goede In-Reply-To: <20221009235426.1231313-13-sashal@kernel.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Hi, On 10/10/22 01:54, Sasha Levin wrote: > From: Hans de Goede > > [ Upstream commit c5b94f5b7819348c59f9949b2b75c341a114cdd4 ] > > Some Toshibas have a broken acpi-video interface for brightness control > and need a special firmware call on resume to turn the panel back on. > So far these have been using the disable_backlight_sysfs_if workaround > to deal with this. > > The recent x86/acpi backlight refactoring has broken this workaround: > 1. This workaround relies on acpi_video_get_backlight_type() returning > acpi_video so that the acpi_video code actually runs; and > 2. this relies on the actual native GPU driver to offer the sysfs > backlight interface to userspace. > > After the refactor this breaks since the native driver will no > longer register its backlight-device if acpi_video_get_backlight_type() > does not return native and making it return native breaks 1. > > Keeping the acpi_video backlight handling on resume active, while not > using it to set the brightness, is necessary because it does a _BCM > call on resume which is necessary to turn the panel back on on resume. > > Looking at the DSDT shows that this _BCM call results in a Toshiba > HCI_SET HCI_LCD_BRIGHTNESS call, which turns the panel back on. > > This kind of special vendor specific handling really belongs in > the vendor specific acpi driver. An earlier patch in this series > modifies toshiba_acpi to make the necessary HCI_SET call on resume > on affected models. > > With toshiba_acpi taking care of the HCI_SET call on resume, > the acpi_video code no longer needs to call _BCM on resume. > > So instead of using the (now broken) disable_backlight_sysfs_if > workaround, simply setting acpi_backlight=native to disable > the broken apci-video interface is sufficient fix things now. > > After this there are no more users of the disable_backlight_sysfs_if > flag and as discussed above the flag also no longer works as intended, > so remove the disable_backlight_sysfs_if flag entirely. > > Acked-by: Rafael J. Wysocki > Tested-by: Arvid Norlander > Signed-off-by: Hans de Goede > Signed-off-by: Sasha Levin This patch goes hand in hand with: commit 3cb1f40dfdc3 ("drivers/platform: toshiba_acpi: Call HCI_PANEL_POWER_ON on resume on some models") and without that commit also being present it will cause a regression on the quirked Toshiba models. This really is part of the big x86/ACPI backlight handling refactor which has landed in 6.1 and as such is not intended for older kernels, please drop this from the stable series. Regards, Hans > --- > drivers/acpi/acpi_video.c | 48 ------------------------------------- > drivers/acpi/video_detect.c | 35 +++++++++++++++++++++++++++ > 2 files changed, 35 insertions(+), 48 deletions(-) > > diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c > index 390af28f6faf..98ac38cbefdd 100644 > --- a/drivers/acpi/acpi_video.c > +++ b/drivers/acpi/acpi_video.c > @@ -47,9 +47,6 @@ module_param(brightness_switch_enabled, bool, 0644); > static bool allow_duplicates; > module_param(allow_duplicates, bool, 0644); > > -static int disable_backlight_sysfs_if = -1; > -module_param(disable_backlight_sysfs_if, int, 0444); > - > #define REPORT_OUTPUT_KEY_EVENTS 0x01 > #define REPORT_BRIGHTNESS_KEY_EVENTS 0x02 > static int report_key_events = -1; > @@ -382,14 +379,6 @@ static int video_set_bqc_offset(const struct dmi_system_id *d) > return 0; > } > > -static int video_disable_backlight_sysfs_if( > - const struct dmi_system_id *d) > -{ > - if (disable_backlight_sysfs_if == -1) > - disable_backlight_sysfs_if = 1; > - return 0; > -} > - > static int video_set_device_id_scheme(const struct dmi_system_id *d) > { > device_id_scheme = true; > @@ -462,40 +451,6 @@ static const struct dmi_system_id video_dmi_table[] = { > }, > }, > > - /* > - * Some machines have a broken acpi-video interface for brightness > - * control, but still need an acpi_video_device_lcd_set_level() call > - * on resume to turn the backlight power on. We Enable backlight > - * control on these systems, but do not register a backlight sysfs > - * as brightness control does not work. > - */ > - { > - /* https://bugzilla.kernel.org/show_bug.cgi?id=21012 */ > - .callback = video_disable_backlight_sysfs_if, > - .ident = "Toshiba Portege R700", > - .matches = { > - DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), > - DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE R700"), > - }, > - }, > - { > - /* https://bugs.freedesktop.org/show_bug.cgi?id=82634 */ > - .callback = video_disable_backlight_sysfs_if, > - .ident = "Toshiba Portege R830", > - .matches = { > - DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), > - DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE R830"), > - }, > - }, > - { > - /* https://bugzilla.kernel.org/show_bug.cgi?id=21012 */ > - .callback = video_disable_backlight_sysfs_if, > - .ident = "Toshiba Satellite R830", > - .matches = { > - DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), > - DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE R830"), > - }, > - }, > /* > * Some machine's _DOD IDs don't have bit 31(Device ID Scheme) set > * but the IDs actually follow the Device ID Scheme. > @@ -1769,9 +1724,6 @@ static void acpi_video_dev_register_backlight(struct acpi_video_device *device) > if (result) > return; > > - if (disable_backlight_sysfs_if > 0) > - return; > - > name = kasprintf(GFP_KERNEL, "acpi_video%d", count); > if (!name) > return; > diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c > index e39d59ad6496..3a27f2364159 100644 > --- a/drivers/acpi/video_detect.c > +++ b/drivers/acpi/video_detect.c > @@ -500,6 +500,41 @@ static const struct dmi_system_id video_detect_dmi_table[] = { > DMI_MATCH(DMI_BOARD_NAME, "PF5LUXG"), > }, > }, > + /* > + * These Toshibas have a broken acpi-video interface for brightness > + * control. They also have an issue where the panel is off after > + * suspend until a special firmware call is made to turn it back > + * on. This is handled by the toshiba_acpi kernel module, so that > + * module must be enabled for these models to work correctly. > + */ > + { > + /* https://bugzilla.kernel.org/show_bug.cgi?id=21012 */ > + .callback = video_detect_force_native, > + /* Toshiba Portégé R700 */ > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), > + DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE R700"), > + }, > + }, > + { > + /* Portégé: https://bugs.freedesktop.org/show_bug.cgi?id=82634 */ > + /* Satellite: https://bugzilla.kernel.org/show_bug.cgi?id=21012 */ > + .callback = video_detect_force_native, > + /* Toshiba Satellite/Portégé R830 */ > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), > + DMI_MATCH(DMI_PRODUCT_NAME, "R830"), > + }, > + }, > + { > + .callback = video_detect_force_native, > + /* Toshiba Satellite/Portégé Z830 */ > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), > + DMI_MATCH(DMI_PRODUCT_NAME, "Z830"), > + }, > + }, > + > /* > * Desktops which falsely report a backlight and which our heuristics > * for this do not catch.