* [PATCH 1/2] Revert "platform/x86: asus-nb-wmi: Drop duplicate DMI quirk structures"
2021-04-19 7:49 [PATCH 0/2] Remove GA14/15 quirks to acpi/video_detect Luke D. Jones
@ 2021-04-19 7:49 ` Luke D. Jones
2021-04-19 7:49 ` [PATCH 2/2] Revert "platform/x86: asus-nb-wmi: add support for ASUS ROG Zephyrus G14 and G15" Luke D. Jones
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Luke D. Jones @ 2021-04-19 7:49 UTC (permalink / raw)
To: hdegoede
Cc: corentin.chary, acpi4asus-user, platform-driver-x86,
linux-kernel, Luke D. Jones
This reverts commit 67186653c90360922e3965d0376a61dbf6c42711.
---
drivers/platform/x86/asus-nb-wmi.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
index d41d7ad14be0..b07b1288346e 100644
--- a/drivers/platform/x86/asus-nb-wmi.c
+++ b/drivers/platform/x86/asus-nb-wmi.c
@@ -110,7 +110,12 @@ static struct quirk_entry quirk_asus_forceals = {
.wmi_force_als_set = true,
};
-static struct quirk_entry quirk_asus_vendor_backlight = {
+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,
};
@@ -432,7 +437,7 @@ static const struct dmi_system_id asus_quirks[] = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_PRODUCT_NAME, "GA401IH"),
},
- .driver_data = &quirk_asus_vendor_backlight,
+ .driver_data = &quirk_asus_ga401i,
},
{
.callback = dmi_matched,
@@ -441,7 +446,7 @@ static const struct dmi_system_id asus_quirks[] = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_PRODUCT_NAME, "GA401II"),
},
- .driver_data = &quirk_asus_vendor_backlight,
+ .driver_data = &quirk_asus_ga401i,
},
{
.callback = dmi_matched,
@@ -450,7 +455,7 @@ static const struct dmi_system_id asus_quirks[] = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_PRODUCT_NAME, "GA401IU"),
},
- .driver_data = &quirk_asus_vendor_backlight,
+ .driver_data = &quirk_asus_ga401i,
},
{
.callback = dmi_matched,
@@ -459,7 +464,7 @@ static const struct dmi_system_id asus_quirks[] = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_PRODUCT_NAME, "GA401IV"),
},
- .driver_data = &quirk_asus_vendor_backlight,
+ .driver_data = &quirk_asus_ga401i,
},
{
.callback = dmi_matched,
@@ -468,7 +473,7 @@ static const struct dmi_system_id asus_quirks[] = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_PRODUCT_NAME, "GA401IVC"),
},
- .driver_data = &quirk_asus_vendor_backlight,
+ .driver_data = &quirk_asus_ga401i,
},
{
.callback = dmi_matched,
@@ -477,7 +482,7 @@ static const struct dmi_system_id asus_quirks[] = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_PRODUCT_NAME, "GA502II"),
},
- .driver_data = &quirk_asus_vendor_backlight,
+ .driver_data = &quirk_asus_ga502i,
},
{
.callback = dmi_matched,
@@ -486,7 +491,7 @@ static const struct dmi_system_id asus_quirks[] = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_PRODUCT_NAME, "GA502IU"),
},
- .driver_data = &quirk_asus_vendor_backlight,
+ .driver_data = &quirk_asus_ga502i,
},
{
.callback = dmi_matched,
@@ -495,7 +500,7 @@ static const struct dmi_system_id asus_quirks[] = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_PRODUCT_NAME, "GA502IV"),
},
- .driver_data = &quirk_asus_vendor_backlight,
+ .driver_data = &quirk_asus_ga502i,
},
{
.callback = dmi_matched,
--
2.31.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/2] Revert "platform/x86: asus-nb-wmi: add support for ASUS ROG Zephyrus G14 and G15"
2021-04-19 7:49 [PATCH 0/2] Remove GA14/15 quirks to acpi/video_detect Luke D. Jones
2021-04-19 7:49 ` [PATCH 1/2] Revert "platform/x86: asus-nb-wmi: Drop duplicate DMI quirk structures" Luke D. Jones
@ 2021-04-19 7:49 ` Luke D. Jones
2021-04-19 8:00 ` [PATCH 0/2] Remove GA14/15 quirks to acpi/video_detect Hans de Goede
2021-05-21 10:24 ` Hans de Goede
3 siblings, 0 replies; 8+ messages in thread
From: Luke D. Jones @ 2021-04-19 7:49 UTC (permalink / raw)
To: hdegoede
Cc: corentin.chary, acpi4asus-user, platform-driver-x86,
linux-kernel, Luke D. Jones
This reverts commit 13bceda68fb9ef388ad40d355ab8d03ee64d14c2.
---
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 b07b1288346e..0cb927f0f301 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,
};
@@ -430,78 +420,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.31.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 0/2] Remove GA14/15 quirks to acpi/video_detect
2021-04-19 7:49 [PATCH 0/2] Remove GA14/15 quirks to acpi/video_detect Luke D. Jones
2021-04-19 7:49 ` [PATCH 1/2] Revert "platform/x86: asus-nb-wmi: Drop duplicate DMI quirk structures" Luke D. Jones
2021-04-19 7:49 ` [PATCH 2/2] Revert "platform/x86: asus-nb-wmi: add support for ASUS ROG Zephyrus G14 and G15" Luke D. Jones
@ 2021-04-19 8:00 ` Hans de Goede
[not found] ` <M0XSRQ.41V51K2O2UAK@ljones.dev>
2021-05-21 10:24 ` Hans de Goede
3 siblings, 1 reply; 8+ messages in thread
From: Hans de Goede @ 2021-04-19 8:00 UTC (permalink / raw)
To: Luke D. Jones
Cc: corentin.chary, acpi4asus-user, platform-driver-x86, linux-kernel
Hi Luke,
On 4/19/21 9:49 AM, Luke D. Jones wrote:
> Revert two commits to allow a patch to acpi/video_detect to correctly
> set the backlight control as native.
Thank you for following up on our previous discussion about this.
I'll merge this as soon as Rafael has accepted to matching
drivers/acpi/video_detect.c patch.
Regards,
Hans
> Luke D. Jones (2):
> Revert "platform/x86: asus-nb-wmi: Drop duplicate DMI quirk
> structures"
> Revert "platform/x86: asus-nb-wmi: add support for ASUS ROG Zephyrus
> G14 and G15"
>
> drivers/platform/x86/asus-nb-wmi.c | 77 ------------------------------
> 1 file changed, 77 deletions(-)
>
> --
> 2.31.1
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 0/2] Remove GA14/15 quirks to acpi/video_detect
2021-04-19 7:49 [PATCH 0/2] Remove GA14/15 quirks to acpi/video_detect Luke D. Jones
` (2 preceding siblings ...)
2021-04-19 8:00 ` [PATCH 0/2] Remove GA14/15 quirks to acpi/video_detect Hans de Goede
@ 2021-05-21 10:24 ` Hans de Goede
2021-05-21 10:36 ` Luke Jones
[not found] ` <HEDGTQ.IHJJLIVNVMJ21@ljones.dev>
3 siblings, 2 replies; 8+ messages in thread
From: Hans de Goede @ 2021-05-21 10:24 UTC (permalink / raw)
To: Luke D. Jones
Cc: corentin.chary, acpi4asus-user, platform-driver-x86, linux-kernel
Hi Luke,
On 4/19/21 9:49 AM, Luke D. Jones wrote:
> Revert two commits to allow a patch to acpi/video_detect to correctly
> set the backlight control as native.
>
> Luke D. Jones (2):
> Revert "platform/x86: asus-nb-wmi: Drop duplicate DMI quirk
> structures"
> Revert "platform/x86: asus-nb-wmi: add support for ASUS ROG Zephyrus
> G14 and G15"
Thank you, since the matching drivers/acpi/video_detect.c have been merged
by Rafael, I've added these to my review-hans branch now.
But there is one problem, these miss a:
Signed-off-by: Luke D. Jones <luke@ljones.dev>
In their commit message, I assume this was an oversight, so I've added
this. If you can let me know if this is ok, then I can push these to
for-next.
I've also rewritten the commit messages to explain why things are being
reverted, see:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
Regards,
Hans
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 0/2] Remove GA14/15 quirks to acpi/video_detect
2021-05-21 10:24 ` Hans de Goede
@ 2021-05-21 10:36 ` Luke Jones
[not found] ` <HEDGTQ.IHJJLIVNVMJ21@ljones.dev>
1 sibling, 0 replies; 8+ messages in thread
From: Luke Jones @ 2021-05-21 10:36 UTC (permalink / raw)
To: Hans de Goede
Cc: corentin.chary, acpi4asus-user, platform-driver-x86, linux-kernel
Oh, thanks Hans. I wasn't sure how a git revert was meant to work and
assumed that
whatever git did was fine.
I am absolutely happy for you to take care of those issues and push
ahead.
Many thanks!
On Fri, May 21 2021 at 12:24:13 +0200, Hans de Goede
<hdegoede@redhat.com> wrote:
> Hi Luke,
>
> On 4/19/21 9:49 AM, Luke D. Jones wrote:
>> Revert two commits to allow a patch to acpi/video_detect to
>> correctly
>> set the backlight control as native.
>>
>> Luke D. Jones (2):
>> Revert "platform/x86: asus-nb-wmi: Drop duplicate DMI quirk
>> structures"
>> Revert "platform/x86: asus-nb-wmi: add support for ASUS ROG
>> Zephyrus
>> G14 and G15"
>
> Thank you, since the matching drivers/acpi/video_detect.c have been
> merged
> by Rafael, I've added these to my review-hans branch now.
>
> But there is one problem, these miss a:
>
> Signed-off-by: Luke D. Jones <luke@ljones.dev>
>
> In their commit message, I assume this was an oversight, so I've added
> this. If you can let me know if this is ok, then I can push these to
> for-next.
>
> I've also rewritten the commit messages to explain why things are
> being
> reverted, see:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
>
> Regards,
>
> Hans
>
^ permalink raw reply [flat|nested] 8+ messages in thread[parent not found: <HEDGTQ.IHJJLIVNVMJ21@ljones.dev>]
* Re: [PATCH 0/2] Remove GA14/15 quirks to acpi/video_detect
[not found] ` <HEDGTQ.IHJJLIVNVMJ21@ljones.dev>
@ 2021-05-21 16:58 ` Hans de Goede
0 siblings, 0 replies; 8+ messages in thread
From: Hans de Goede @ 2021-05-21 16:58 UTC (permalink / raw)
To: Luke Jones
Cc: corentin.chary, acpi4asus-user, platform-driver-x86, linux-kernel
Hi,
On 5/21/21 12:35 PM, Luke Jones wrote:
> Oh, thanks Hans. I wasn't sure how a git revert was meant to work and assumed that
> whatever git did was fine.
>
> I am absolutely happy for you to take care of those issues and push ahead.
Ok, I've pushed these 2 patches to pdx86/for-next now.
Regards,
Hans
> On Fri, May 21 2021 at 12:24:13 +0200, Hans de Goede <hdegoede@redhat.com> wrote:
>> Hi Luke, On 4/19/21 9:49 AM, Luke D. Jones wrote:
>>
>> Revert two commits to allow a patch to acpi/video_detect to correctly set the backlight control as native. Luke D. Jones (2): Revert "platform/x86: asus-nb-wmi: Drop duplicate DMI quirk structures" Revert "platform/x86: asus-nb-wmi: add support for ASUS ROG Zephyrus G14 and G15"
>>
>> Thank you, since the matching drivers/acpi/video_detect.c have been merged by Rafael, I've added these to my review-hans branch now. But there is one problem, these miss a: Signed-off-by: Luke D. Jones <luke@ljones.dev <mailto:luke@ljones.dev>> In their commit message, I assume this was an oversight, so I've added this. If you can let me know if this is ok, then I can push these to for-next. I've also rewritten the commit messages to explain why things are being reverted, see: https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans <https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans> Regards, Hans
^ permalink raw reply [flat|nested] 8+ messages in thread