ACPI: move models with win8 brightness problems from win8 blacklist to use_native_backlight

When the windows8 related backlight problems became evident, 2 approaches
were follow in parallel, one was to stop claiming to be windows 8 / 2012,
the other was to tell acpi_video to stop registering a backlight driver.

I've read all the threads and it seems that which approach ended up being
applied to which model laptop was never really a concious decision (AFAIK):

https://bugzilla.kernel.org/show_bug.cgi?id=51231
https://bugzilla.kernel.org/show_bug.cgi?id=60682

So lets move all the models which are only on the win8 blacklist because of
brightness issues to the use_native_backlight list, which is the smaller
hammer to use to solve the backlight issues.

Making this change is esp. attractive now that 3.16 has
video.use_native_brightness=1 by default. If that new default does not get
reverted because of regressions, then we can drop all the models
with a use_native_backlight quirk, greatly reducing the number of models we've
a quirk for.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=51231
Link: https://bugzilla.kernel.org/show_bug.cgi?id=60682
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

2 files changed, 68 insertions, 68 deletions

diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index 3d8413d02a97..36eb42e3b0bb 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -247,75 +247,11 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
         },
 
         /*
-         * The following machines have broken backlight support when reporting
-         * the Windows 2012 OSI, so disable it until their support is fixed.
+         * These machines will power on immediately after shutdown when
+         * reporting the Windows 2012 OSI.
          */
         {
         .callback = dmi_disable_osi_win8,
-        .ident = "ASUS Zenbook Prime UX31A",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                     DMI_MATCH(DMI_PRODUCT_NAME, "UX31A"),
-                },
-        },
-        {
-        .callback = dmi_disable_osi_win8,
-        .ident = "ThinkPad Edge E530",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                     DMI_MATCH(DMI_PRODUCT_VERSION, "3259A2G"),
-                },
-        },
-        {
-        .callback = dmi_disable_osi_win8,
-        .ident = "ThinkPad Edge E530",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                     DMI_MATCH(DMI_PRODUCT_VERSION, "3259CTO"),
-                },
-        },
-        {
-        .callback = dmi_disable_osi_win8,
-        .ident = "ThinkPad Edge E530",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                     DMI_MATCH(DMI_PRODUCT_VERSION, "3259HJG"),
-                },
-        },
-        {
-        .callback = dmi_disable_osi_win8,
-        .ident = "Acer Aspire V5-573G",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Acer Aspire"),
-                     DMI_MATCH(DMI_PRODUCT_VERSION, "V5-573G/Dazzle_HW"),
-                },
-        },
-        {
-        .callback = dmi_disable_osi_win8,
-        .ident = "Acer Aspire V5-572G",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Acer Aspire"),
-                     DMI_MATCH(DMI_PRODUCT_VERSION, "V5-572G/Dazzle_CX"),
-                },
-        },
-        {
-        .callback = dmi_disable_osi_win8,
-        .ident = "ThinkPad T431s",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                     DMI_MATCH(DMI_PRODUCT_VERSION, "20AACTO1WW"),
-                },
-        },
-        {
-        .callback = dmi_disable_osi_win8,
-        .ident = "ThinkPad T430",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                     DMI_MATCH(DMI_PRODUCT_VERSION, "2349D15"),
-                },
-        },
-        {
-        .callback = dmi_disable_osi_win8,
         .ident = "Dell Inspiron 7737",
         .matches = {
                     DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index bfe1fa2fb5d1..18c0e6920eb4 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -463,6 +463,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
         },
         {
          .callback = video_set_use_native_backlight,
+         .ident = "ThinkPad X230",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X230"),
+                },
+        },
+        {
+         .callback = video_set_use_native_backlight,
          .ident = "ThinkPad T430 and T430s",
          .matches = {
                 DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
@@ -471,10 +479,42 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
         },
         {
          .callback = video_set_use_native_backlight,
-         .ident = "ThinkPad X230",
+         .ident = "ThinkPad T430",
          .matches = {
                 DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X230"),
+                DMI_MATCH(DMI_PRODUCT_VERSION, "2349D15"),
+                },
+        },
+        {
+         .callback = video_set_use_native_backlight,
+         .ident = "ThinkPad T431s",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                DMI_MATCH(DMI_PRODUCT_VERSION, "20AACTO1WW"),
+                },
+        },
+        {
+         .callback = video_set_use_native_backlight,
+         .ident = "ThinkPad Edge E530",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                DMI_MATCH(DMI_PRODUCT_VERSION, "3259A2G"),
+                },
+        },
+        {
+         .callback = video_set_use_native_backlight,
+         .ident = "ThinkPad Edge E530",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                DMI_MATCH(DMI_PRODUCT_VERSION, "3259CTO"),
+                },
+        },
+        {
+         .callback = video_set_use_native_backlight,
+         .ident = "ThinkPad Edge E530",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                DMI_MATCH(DMI_PRODUCT_VERSION, "3259HJG"),
                 },
         },
         {
@@ -574,6 +614,30 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
                 },
         },
         {
+         .callback = video_set_use_native_backlight,
+         .ident = "Acer Aspire V5-572G",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "Acer Aspire"),
+                DMI_MATCH(DMI_PRODUCT_VERSION, "V5-572G/Dazzle_CX"),
+                },
+        },
+        {
+         .callback = video_set_use_native_backlight,
+         .ident = "Acer Aspire V5-573G",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "Acer Aspire"),
+                DMI_MATCH(DMI_PRODUCT_VERSION, "V5-573G/Dazzle_HW"),
+                },
+        },
+        {
+         .callback = video_set_use_native_backlight,
+         .ident = "ASUS Zenbook Prime UX31A",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+                DMI_MATCH(DMI_PRODUCT_NAME, "UX31A"),
+                },
+        },
+        {
         .callback = video_set_use_native_backlight,
         .ident = "HP ProBook 4340s",
         .matches = {