platform/x86: asus-wmi: Move acpi_backlight=vendor quirks to ACPI video_detect.c

Remove the asus-wmi quirk_entry.wmi_backlight_power quirk-flag, which
called acpi_video_set_dmi_backlight_type(acpi_backlight_vendor) and replace
it with acpi/video_detect.c video_detect_dmi_table[] entries using the
video_detect_force_vendor callback.

acpi_video_set_dmi_backlight_type() is troublesome because it may end up
getting called after other backlight drivers have already called
acpi_video_get_backlight_type() resulting in the other drivers
already being registered even though they should not.

Note no entries are dropped from the dmi_system_id table in asus-nb-wmi.c.
This is because the entries using the removed wmi_backlight_power flag
also use other model specific quirks from the asus-wmi quirk_entry struct.
So the quirk_asus_x55u struct and the entries pointing to it cannot be
dropped.

Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index 6a2523bc02bad8752170405043e0c9451643db54..d893313fe1a0dcc845b00900ab87402a464b0450 100644 (file)
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -174,6 +174,46 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
                DMI_MATCH(DMI_PRODUCT_NAME, "UL30A"),
                },
        },
+       {
+        .callback = video_detect_force_vendor,
+        /* Asus X55U */
+        .matches = {
+               DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+               DMI_MATCH(DMI_PRODUCT_NAME, "X55U"),
+               },
+       },
+       {
+        .callback = video_detect_force_vendor,
+        /* Asus X101CH */
+        .matches = {
+               DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+               DMI_MATCH(DMI_PRODUCT_NAME, "X101CH"),
+               },
+       },
+       {
+        .callback = video_detect_force_vendor,
+        /* Asus X401U */
+        .matches = {
+               DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+               DMI_MATCH(DMI_PRODUCT_NAME, "X401U"),
+               },
+       },
+       {
+        .callback = video_detect_force_vendor,
+        /* Asus X501U */
+        .matches = {
+               DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+               DMI_MATCH(DMI_PRODUCT_NAME, "X501U"),
+               },
+       },
+       {
+        .callback = video_detect_force_vendor,
+        /* Asus 1015CX */
+        .matches = {
+               DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+               DMI_MATCH(DMI_PRODUCT_NAME, "1015CX"),
+               },
+       },
        {
        .callback = video_detect_force_vendor,
        /* GIGABYTE GB-BXBT-2807 */

diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
index 478dd300b9c9a77e2564895955031e237eec9eb1..810a94557a859a86ddeb4ba4b2614ed024258ae8 100644 (file)
--- a/drivers/platform/x86/asus-nb-wmi.c
+++ b/drivers/platform/x86/asus-nb-wmi.c
@@ -79,12 +79,10 @@ static struct quirk_entry quirk_asus_q500a = {
 
 /*
  * For those machines that need software to control bt/wifi status
- * and can't adjust brightness through ACPI interface
  * and have duplicate events(ACPI and WMI) for display toggle
  */
 static struct quirk_entry quirk_asus_x55u = {
        .wapf = 4,
-       .wmi_backlight_power = true,
        .wmi_backlight_set_devstate = true,
        .no_display_toggle = true,
 };
@@ -147,11 +145,6 @@ static const struct dmi_system_id asus_quirks[] = {
                        DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
                        DMI_MATCH(DMI_PRODUCT_NAME, "U32U"),
                },
-               /*
-                * Note this machine has a Brazos APU, and most Brazos Asus
-                * machines need quirk_asus_x55u / wmi_backlight_power but
-                * here acpi-video seems to work fine for backlight control.
-                */
                .driver_data = &quirk_asus_wapf4,
        },
        {

diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 301166a5697dac671346c7903d08dd9b5d193988..5cf9d9aff1640cb9eaf1fd7800e721f6b417d249 100644 (file)
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -3634,9 +3634,6 @@ static int asus_wmi_add(struct platform_device *pdev)
        if (asus->driver->quirks->wmi_force_als_set)
                asus_wmi_set_als();
 
-       if (asus->driver->quirks->wmi_backlight_power)
-               acpi_video_set_dmi_backlight_type(acpi_backlight_vendor);
-
        if (asus->driver->quirks->wmi_backlight_native)
                acpi_video_set_dmi_backlight_type(acpi_backlight_native);
 

diff --git a/drivers/platform/x86/asus-wmi.h b/drivers/platform/x86/asus-wmi.h
index b302415bf1d951a8f6a81bc0d83ea4f1d1beddde..30770e411301325e7b26632e3e04bd3631204dbd 100644 (file)
--- a/drivers/platform/x86/asus-wmi.h
+++ b/drivers/platform/x86/asus-wmi.h
@@ -29,7 +29,6 @@ struct quirk_entry {
        bool hotplug_wireless;
        bool scalar_panel_brightness;
        bool store_backlight_power;
-       bool wmi_backlight_power;
        bool wmi_backlight_native;
        bool wmi_backlight_set_devstate;
        bool wmi_force_als_set;

diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c
index ce86d84ee796deac934ce4dc041759cbcbc4f76a..32d9f0ba6be3f9b084b0a3775583a247c213fc9c 100644 (file)
--- a/drivers/platform/x86/eeepc-wmi.c
+++ b/drivers/platform/x86/eeepc-wmi.c
@@ -96,11 +96,6 @@ static struct quirk_entry quirk_asus_et2012_type3 = {
        .store_backlight_power = true,
 };
 
-static struct quirk_entry quirk_asus_x101ch = {
-       /* We need this when ACPI function doesn't do this well */
-       .wmi_backlight_power = true,
-};
-
 static struct quirk_entry *quirks;
 
 static void et2012_quirks(void)
@@ -151,25 +146,7 @@ static const struct dmi_system_id asus_quirks[] = {
                },
                .driver_data = &quirk_asus_unknown,
        },
-       {
-               .callback = dmi_matched,
-               .ident = "ASUSTeK Computer INC. X101CH",
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "X101CH"),
-               },
-               .driver_data = &quirk_asus_x101ch,
-       },
-       {
-               .callback = dmi_matched,
-               .ident = "ASUSTeK Computer INC. 1015CX",
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "1015CX"),
-               },
-               .driver_data = &quirk_asus_x101ch,
-       },
-       {},
+       {}
 };
 
 static void eeepc_wmi_key_filter(struct asus_wmi_driver *asus_wmi, int *code,