lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 223/700] platform/x86: asus-nb-wmi: Revert "add support for ASUS ROG Zephyrus G14 and G15"
    Date
    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 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.30.2


    \
     
     \ /
      Last update: 2021-07-12 09:35    [W:2.067 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site