samsung-laptop: X360 ACPI backlight device is broken

[firefly-linux-kernel-4.4.55.git] / drivers / platform / x86 / samsung-laptop.c

diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
index e2a34b42ddc1d584b5333fe9921d0d2c2b12dda4..98f07588ac86d3633f18c976106bc9719e67c60a 100644 (file)
--- a/drivers/platform/x86/samsung-laptop.c
+++ b/drivers/platform/x86/samsung-laptop.c
@@ -26,7 +26,7 @@
 #include <linux/seq_file.h>
 #include <linux/debugfs.h>
 #include <linux/ctype.h>
-#if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE)
+#ifdef CONFIG_ACPI_VIDEO
 #include <acpi/video.h>
 #endif
 
@@ -1506,6 +1506,16 @@ static struct dmi_system_id __initdata samsung_dmi_table[] = {
                },
         .driver_data = &samsung_broken_acpi_video,
        },
+       {
+        .callback = samsung_dmi_matched,
+        .ident = "X360",
+        .matches = {
+               DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
+               DMI_MATCH(DMI_PRODUCT_NAME, "X360"),
+               DMI_MATCH(DMI_BOARD_NAME, "X360"),
+               },
+        .driver_data = &samsung_broken_acpi_video,
+       },
        { },
 };
 MODULE_DEVICE_TABLE(dmi, samsung_dmi_table);
@@ -1530,15 +1540,18 @@ static int __init samsung_init(void)
        samsung->quirks = quirks;
 
 
-#if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE)
+#ifdef CONFIG_ACPI
+       if (samsung->quirks->broken_acpi_video)
+               acpi_video_dmi_promote_vendor();
+
        /* Don't handle backlight here if the acpi video already handle it */
        if (acpi_video_backlight_support()) {
-               if (samsung->quirks->broken_acpi_video) {
-                       pr_info("Disabling ACPI video driver\n");
-                       acpi_video_unregister();
-               } else {
-                       samsung->handle_backlight = false;
-               }
+               samsung->handle_backlight = false;
+       } else if (samsung->quirks->broken_acpi_video) {
+               pr_info("Disabling ACPI video driver\n");
+#ifdef CONFIG_ACPI_VIDEO
+               acpi_video_unregister();
+#endif
        }
 #endif
 
@@ -1552,8 +1565,7 @@ static int __init samsung_init(void)
 
 #ifdef CONFIG_ACPI
        /* Only log that if we are really on a sabi platform */
-       if (acpi_video_backlight_support() &&
-           !samsung->quirks->broken_acpi_video)
+       if (acpi_video_backlight_support())
                pr_info("Backlight controlled by ACPI video driver\n");
 #endif