From patchwork Mon Oct 24 11:32:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10131 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp633978wru; Mon, 24 Oct 2022 13:15:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5nA5TD5uvqxLnFvMKa6kcVpcSw599Z296vngExFgOsrnaMoTn8zIJ+KlUznsB79Mq682IN X-Received: by 2002:a17:903:2286:b0:185:3948:be93 with SMTP id b6-20020a170903228600b001853948be93mr35548337plh.121.1666642546568; Mon, 24 Oct 2022 13:15:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666642546; cv=none; d=google.com; s=arc-20160816; b=h1zRphMthNDhb/AxjNdXZ/oNGbLxussp4wF7HHFk7s9e5gzEvp1tHq58jP79u8WnXl WC3uvSPvE0+2cjNA9zouKcO/T1VN/Q6Mc/3r2xoy1XIOmNABUbaK0DzO2/hNenfr36Bj iQ1u4ZTTBRrKTXqbhDFeZkq2P0vOY0hiiFN9y5bOhQ99kq7FN+SpNy7Io2TViXR9psN2 yCHBlKb4CoOMX0tMqOsryhpZK6fg592+fvwAuy31XTufRY41EhOwDGVBVm/ZcmlNkeuD 2ksOtENSfRfdwjxmJ8eFgfbCwXfANjqwVE7hDcdK5rm7lfZyOfbum2FndAAwet18b2qi ya3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qOpL9suhQcr7KoOzK/WtyEzwn+VcWDSuiWoYEnblctI=; b=afyl5MRCvDh5h5aH2DZ1j4wixlJnuRmllrT+jCnKtqQyog4o2Naz2i6ez66PTheDKR 7BSADupr4pURGC275G4bHE6ENZHkM1gvwwS2zeqyTtzn65b6pp3C035WD9fhSXqLEBer c+UT63i58/tBlWvlVD2U8+czmS03jJuXM43tTObink7KrsUvzlUvT+e1tW42+pQoKGP3 mh8vsUrQR5Amtu/4NDmShUNwZRXFq+8aWeYYhSyP3qpBlm8FX6FYrMW/W/0+Rrw0rzGF PcSToJO+ItOvoIWkqTVUARrWLZknPCMjr6MOGA0AA0VEad33qaUjMGZFvgfLHcWMwoie UXMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=F+oDRZJb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o18-20020a170902d4d200b0018687896060si636025plg.178.2022.10.24.13.15.33; Mon, 24 Oct 2022 13:15:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=F+oDRZJb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229970AbiJXUH3 (ORCPT + 99 others); Mon, 24 Oct 2022 16:07:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233098AbiJXUGq (ORCPT ); Mon, 24 Oct 2022 16:06:46 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F19523BE1; Mon, 24 Oct 2022 11:26:49 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id DB44EB819EF; Mon, 24 Oct 2022 12:50:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3ADA4C433C1; Mon, 24 Oct 2022 12:50:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615840; bh=XWJl14xqxYLN7Cmh93GCYEp7PqTpU+THLwwdSyqmOjw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F+oDRZJbf53EoJA2XlZr/EnPu0IA+vi5cFfCzs6ZaVh5+WRi9onAJKMPGeBrUbQmZ W+MPE/EHLOoi+cqScI6iM7tNy0nYv5UBmCFEp/s7IqiHsaoDyU3SYyLK43nd1IjpDt xrBG7YBDnCqLNrlenmF7Hh5r+/tDCeTqVeCYoqBI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans de Goede , Arvid Norlander , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 5.15 404/530] ACPI: video: Add Toshiba Satellite/Portege Z830 quirk Date: Mon, 24 Oct 2022 13:32:28 +0200 Message-Id: <20221024113103.357629445@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747601375028029965?= X-GMAIL-MSGID: =?utf-8?q?1747601375028029965?= From: Arvid Norlander [ Upstream commit 574160b8548deff8b80b174f03201e94ab8431e2 ] Toshiba Satellite Z830 needs the quirk video_disable_backlight_sysfs_if for proper backlight control after suspend/resume cycles. Toshiba Portege Z830 is simply the same laptop rebranded for certain markets (I looked through the manual to other language sections to confirm this) and thus also needs this quirk. Thanks to Hans de Goede for suggesting this fix. Link: https://www.spinics.net/lists/platform-driver-x86/msg34394.html Suggested-by: Hans de Goede Signed-off-by: Arvid Norlander Reviewed-by: Hans de Goede Tested-by: Arvid Norlander Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/acpi_video.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c index 390af28f6faf..2b18b51f6351 100644 --- a/drivers/acpi/acpi_video.c +++ b/drivers/acpi/acpi_video.c @@ -496,6 +496,22 @@ static const struct dmi_system_id video_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE R830"), }, }, + { + .callback = video_disable_backlight_sysfs_if, + .ident = "Toshiba Satellite Z830", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), + DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE Z830"), + }, + }, + { + .callback = video_disable_backlight_sysfs_if, + .ident = "Toshiba Portege Z830", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), + DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE Z830"), + }, + }, /* * Some machine's _DOD IDs don't have bit 31(Device ID Scheme) set * but the IDs actually follow the Device ID Scheme.