From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Luke D. Jones" <luke@ljones.dev>,
Hans de Goede <hdegoede@redhat.com>,
Sasha Levin <sashal@kernel.org>,
acpi4asus-user@lists.sourceforge.net,
platform-driver-x86@vger.kernel.org
Subject: [PATCH AUTOSEL 5.10 23/41] platform/x86: asus-nb-wmi: Revert "add support for ASUS ROG Zephyrus G14 and G15"
Date: Mon, 5 Jul 2021 11:29:43 -0400 [thread overview]
Message-ID: <20210705153001.1521447-23-sashal@kernel.org> (raw)
In-Reply-To: <20210705153001.1521447-1-sashal@kernel.org>
From: "Luke D. Jones" <luke@ljones.dev>
[ Upstream commit 28117f3a5c3c8375a3304af76357d5bf9cf30f0b ]
The quirks added to asus-nb-wmi for the ASUS ROG Zephyrus G14 and G15 are
wrong, they tell the asus-wmi code to use the vendor specific WMI backlight
interface. But there is no such interface on these laptops.
As a side effect, these quirks stop the acpi_video driver to register since
they make acpi_video_get_backlight_type() return acpi_backlight_vendor,
leaving only the native AMD backlight driver in place, which is the one we
want. This happy coincidence is being replaced with a new quirk in
drivers/acpi/video_detect.c which actually sets the backlight_type to
acpi_backlight_native fixinf this properly. This reverts
commit 13bceda68fb9 ("platform/x86: asus-nb-wmi: add support for ASUS ROG
Zephyrus G14 and G15").
Signed-off-by: Luke D. Jones <luke@ljones.dev>
Link: https://lore.kernel.org/r/20210419074915.393433-3-luke@ljones.dev
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/platform/x86/asus-nb-wmi.c | 82 ------------------------------
1 file changed, 82 deletions(-)
diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
index ff39079e2d75..949ddeb673bc 100644
--- a/drivers/platform/x86/asus-nb-wmi.c
+++ b/drivers/platform/x86/asus-nb-wmi.c
@@ -110,16 +110,6 @@ static struct quirk_entry quirk_asus_forceals = {
.wmi_force_als_set = true,
};
-static struct quirk_entry quirk_asus_ga401i = {
- .wmi_backlight_power = true,
- .wmi_backlight_set_devstate = true,
-};
-
-static struct quirk_entry quirk_asus_ga502i = {
- .wmi_backlight_power = true,
- .wmi_backlight_set_devstate = true,
-};
-
static struct quirk_entry quirk_asus_use_kbd_dock_devid = {
.use_kbd_dock_devid = true,
};
@@ -425,78 +415,6 @@ static const struct dmi_system_id asus_quirks[] = {
},
.driver_data = &quirk_asus_forceals,
},
- {
- .callback = dmi_matched,
- .ident = "ASUSTeK COMPUTER INC. GA401IH",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
- DMI_MATCH(DMI_PRODUCT_NAME, "GA401IH"),
- },
- .driver_data = &quirk_asus_ga401i,
- },
- {
- .callback = dmi_matched,
- .ident = "ASUSTeK COMPUTER INC. GA401II",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
- DMI_MATCH(DMI_PRODUCT_NAME, "GA401II"),
- },
- .driver_data = &quirk_asus_ga401i,
- },
- {
- .callback = dmi_matched,
- .ident = "ASUSTeK COMPUTER INC. GA401IU",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
- DMI_MATCH(DMI_PRODUCT_NAME, "GA401IU"),
- },
- .driver_data = &quirk_asus_ga401i,
- },
- {
- .callback = dmi_matched,
- .ident = "ASUSTeK COMPUTER INC. GA401IV",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
- DMI_MATCH(DMI_PRODUCT_NAME, "GA401IV"),
- },
- .driver_data = &quirk_asus_ga401i,
- },
- {
- .callback = dmi_matched,
- .ident = "ASUSTeK COMPUTER INC. GA401IVC",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
- DMI_MATCH(DMI_PRODUCT_NAME, "GA401IVC"),
- },
- .driver_data = &quirk_asus_ga401i,
- },
- {
- .callback = dmi_matched,
- .ident = "ASUSTeK COMPUTER INC. GA502II",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
- DMI_MATCH(DMI_PRODUCT_NAME, "GA502II"),
- },
- .driver_data = &quirk_asus_ga502i,
- },
- {
- .callback = dmi_matched,
- .ident = "ASUSTeK COMPUTER INC. GA502IU",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
- DMI_MATCH(DMI_PRODUCT_NAME, "GA502IU"),
- },
- .driver_data = &quirk_asus_ga502i,
- },
- {
- .callback = dmi_matched,
- .ident = "ASUSTeK COMPUTER INC. GA502IV",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
- DMI_MATCH(DMI_PRODUCT_NAME, "GA502IV"),
- },
- .driver_data = &quirk_asus_ga502i,
- },
{
.callback = dmi_matched,
.ident = "Asus Transformer T100TA / T100HA / T100CHI",
--
2.30.2
next prev parent reply other threads:[~2021-07-05 15:32 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-05 15:29 [PATCH AUTOSEL 5.10 01/41] HID: do not use down_interruptible() when unbinding devices Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 02/41] EDAC/ti: Add missing MODULE_DEVICE_TABLE Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 03/41] ACPI: processor idle: Fix up C-state latency if not ordered Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 04/41] hv_utils: Fix passing zero to 'PTR_ERR' warning Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 05/41] lib: vsprintf: Fix handling of number field widths in vsscanf Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 06/41] Input: goodix - platform/x86: touchscreen_dmi - Move upside down quirks to touchscreen_dmi.c Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 07/41] platform/x86: touchscreen_dmi: Add an extra entry for the upside down Goodix touchscreen on Teclast X89 tablets Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 08/41] platform/x86: touchscreen_dmi: Add info for the Goodix GT912 panel of TM800A550L tablets Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 09/41] ACPI: EC: Make more Asus laptops use ECDT _GPE Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 10/41] block_dump: remove block_dump feature in mark_inode_dirty() Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 11/41] blk-mq: grab rq->refcount before calling ->fn in blk_mq_tagset_busy_iter Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 12/41] blk-mq: clear stale request in tags->rq[] before freeing one request pool Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 13/41] fs: dlm: cancel work sync othercon Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 14/41] random32: Fix implicit truncation warning in prandom_seed_state() Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 15/41] open: don't silently ignore unknown O-flags in openat2() Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 16/41] drivers: hv: Fix missing error code in vmbus_connect() Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 17/41] fs: dlm: fix memory leak when fenced Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 18/41] ACPICA: Fix memory leak caused by _CID repair function Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 19/41] ACPI: bus: Call kobject_put() in acpi_init() error path Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 20/41] ACPI: resources: Add checks for ACPI IRQ override Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 21/41] block: fix race between adding/removing rq qos and normal IO Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 22/41] platform/x86: asus-nb-wmi: Revert "Drop duplicate DMI quirk structures" Sasha Levin
2021-07-05 15:29 ` Sasha Levin [this message]
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 24/41] platform/x86: toshiba_acpi: Fix missing error code in toshiba_acpi_setup_keyboard() Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 25/41] nvme-pci: fix var. type for increasing cq_head Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 26/41] nvmet-fc: do not check for invalid target port in nvmet_fc_handle_fcp_rqst() Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 27/41] EDAC/Intel: Do not load EDAC driver when running as a guest Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 28/41] PCI: hv: Add check for hyperv_initialized in init_hv_pci_drv() Sasha Levin
2021-07-05 15:29 ` [PATCH AUTOSEL 5.10 29/41] cifs: improve fallocate emulation Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210705153001.1521447-23-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=acpi4asus-user@lists.sourceforge.net \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luke@ljones.dev \
--cc=platform-driver-x86@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).