Remove GA14/15 quirks to acpi/video_detect
Luke D. Jones
maintainercover Remove GA14/15 quirks to acpi/video_detect
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"
drivers/platform/x86/asus-nb-wmi.c | 77 ------------------------------ 1 file changed, 77 deletions(-)
--
2.31.1
Luke D. Jones
maintainerPATCH 1/2 Revert "platform/x86: asus-nb-wmi: Drop duplicate DMI quirk structures"
This reverts commit 67186653c90360922e3965d0376a61dbf6c42711.
--- drivers/platform/x86/asus-nb-wmi.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)
drivers/platform/x86/asus-nb-wmi.c +14 -9
@@ -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,
Signature · 1 line
2.31.1
Luke D. Jones
maintainerPATCH 2/2 Revert "platform/x86: asus-nb-wmi: add support for ASUS ROG Zephyrus G14 and G15"
In reply to Luke D. JonesThis reverts commit 13bceda68fb9ef388ad40d355ab8d03ee64d14c2.
--- drivers/platform/x86/asus-nb-wmi.c | 82 ------------------------------ 1 file changed, 82 deletions(-)
drivers/platform/x86/asus-nb-wmi.c +0 -82
@@ -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",
Signature · 1 line
2.31.1
Hi Luke,
Quoted 2 lines · Luke D. Jones
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
Quoted 12 lines
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 ZephyrusG14 and G15"drivers/platform/x86/asus-nb-wmi.c | 77 ------------------------------ 1 file changed, 77 deletions(-)--
2.31.1
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hi,
Quoted 3 lines · Luke Jones
NP Hans, sorry about the length of time this took. Other duties etc.
I appreciated the wealth of insight you were able to provide to enable this.
BTW, I see that your drivers/acpi/video_detect.c patch is marked as [PATCH 1/3] I guess these 2 patches are patch 2/3 and 3/3 ? You may want to send a reply to your own patch to make that clear and to explain that it is a standalone patch.
Please Cc my on the reply.
Regards,
Hans
Hi Luke,
Quoted 8 lines · Luke D. Jones
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 ZephyrusG14 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:
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
Luke Jones
maintainerOh, 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!
Quoted 34 lines · Hans de Goede
Hi Luke,
Quoted 10 lines · Luke D. Jones
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
ZephyrusG14 and G15"Thank you, since the matching
drivers/acpi/video_detect.chave 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 <[email protected]>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
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hi,
Quoted 4 lines · Luke Jones
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
Quoted 6 lines · Hans de Goede
Quoted 5 lines
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.chave 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 <[email protected] <mailto:[email protected]>> 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