From patchwork Mon Oct 24 11:31:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10182 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp641434wru; Mon, 24 Oct 2022 13:35:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6i387K7DhuX4Qf94z0hqUuXqrayXh1ssVxvEpx2gSmAMv1RVPNtBQzlaO1ynZ+0l7CKy68 X-Received: by 2002:a17:907:a40d:b0:78d:9f66:e51f with SMTP id sg13-20020a170907a40d00b0078d9f66e51fmr30056911ejc.654.1666643721238; Mon, 24 Oct 2022 13:35:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666643721; cv=none; d=google.com; s=arc-20160816; b=r1+KUvGWDLf0+1KjknZ9H05yU+EEMm/PhgbGC7qg0tDb6Xd+Sh4tpeHGBelDzktvNE QVsGp0XQ0Zdo+iKCpRgs25S6/ZqKUZGwVuwe8adeuX7+/8Yh0TsXPO+VjO/W8TB4KjSK XThCF5qD6tQT1or94lgFVjx87KRfq90NKtRpo+iS/nNYwYfv0KfT7PbxCPCZEZI8VNbq mdHxrsOqHu272qBbMbgQBgxvBuJwYczihTMf4tfXL343GDGlRhq/padzpZcsgUpMNLVp 79QESssTtWyL2vijVB+0XvXbw8dwGAuU/SUxRLoaZoDUeQ94/JMorafcQjYf3u1VTuAe hmKg== 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=Np/QvNjl0OGzAWu1lHK374GJ3q9jJ+z4D/Q2x/nh0b4=; b=MwcVYyS+MVnbS0NF5+KTftSYjcqyeEhtcf/tELj1ccaY+o2BQ5RNuL3m3zN5Q5vNx/ f6UMYTRejnnduwP8FNB9a+4/qvorUvWD8O+tpFwMlvy4hQuj/F4ATDid3qhmsPtBTPO+ Bhh2gA6sIOVgGLKVsKdTKU/OQJtnuw0eIivJp6jizUIce+Vp9YcgQ/c03C2GPS4292vI 24II8yHY0n+pi9ed1/HhUciopEFWR7JE2ZswxeJWse+xGAsothobamJq2PpN6Ikyjo7F grEAGDRTngkARFqgsDR37pdLoXt1K9tYJQwYjEsF9ZJNS7Xp9v90ueD8vssRi1p8qOd2 31LQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WMaMx8ci; 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 qf14-20020a1709077f0e00b007aaf5a45f5asi713001ejc.47.2022.10.24.13.34.56; Mon, 24 Oct 2022 13:35:21 -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=WMaMx8ci; 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 S231481AbiJXUX4 (ORCPT + 99 others); Mon, 24 Oct 2022 16:23:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234280AbiJXUXF (ORCPT ); Mon, 24 Oct 2022 16:23:05 -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 18505FF278; Mon, 24 Oct 2022 11:38:48 -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 B09C4B815FA; Mon, 24 Oct 2022 12:12:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11031C433D6; Mon, 24 Oct 2022 12:12:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613568; bh=cLGKtLbXVqnDb/ajd2omM5QR/yxh49jN/ogXfZjmH1Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WMaMx8ciqrORJh21IbDIz9P6I22+FWnmBF7rLWw9yKc+WFAmUqYDYfCZZDddcgxoO 7ZYIxeVbh41iPRLOQtoAbpVLf/e1/3D1KZe3ZICPuQZ7bjv2YcfykZEQY5KaC4GM8Y q4roMN/GPJY6gigxVfGuSyZ3cx6ui/gjiRvlhxqk= 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.4 185/255] ACPI: video: Add Toshiba Satellite/Portege Z830 quirk Date: Mon, 24 Oct 2022 13:31:35 +0200 Message-Id: <20221024113009.068729728@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@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?1747602606971157568?= X-GMAIL-MSGID: =?utf-8?q?1747602606971157568?= 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 81cd47d29932..bf18efd49a25 100644 --- a/drivers/acpi/acpi_video.c +++ b/drivers/acpi/acpi_video.c @@ -498,6 +498,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.