Merge v5.6-rc1 into drm-misc-fixes

[linux.git] / drivers / acpi / video_detect.c

diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index 31014c7d3793906be9ee4eeba48c48f199a7f57d..419f814d596ac7f36113d2ee271d2d43b84ff988 100644 (file)
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -302,6 +302,22 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
                DMI_MATCH(DMI_PRODUCT_NAME, "102434U"),
                },
        },
+       {
+        .callback = video_detect_force_native,
+        .ident = "Lenovo E41-25",
+        .matches = {
+               DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+               DMI_MATCH(DMI_PRODUCT_NAME, "81FS"),
+               },
+       },
+       {
+        .callback = video_detect_force_native,
+        .ident = "Lenovo E41-45",
+        .matches = {
+               DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+               DMI_MATCH(DMI_PRODUCT_NAME, "82BK"),
+               },
+       },
        {
         /* https://bugzilla.redhat.com/show_bug.cgi?id=1217249 */
         .callback = video_detect_force_native,
@@ -336,6 +352,11 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
                DMI_MATCH(DMI_PRODUCT_NAME, "Precision 7510"),
                },
        },
+
+       /*
+        * Desktops which falsely report a backlight and which our heuristics
+        * for this do not catch.
+        */
        {
         .callback = video_detect_force_none,
         .ident = "Dell OptiPlex 9020M",
@@ -344,6 +365,14 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
                DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 9020M"),
                },
        },
+       {
+        .callback = video_detect_force_none,
+        .ident = "MSI MS-7721",
+        .matches = {
+               DMI_MATCH(DMI_SYS_VENDOR, "MSI"),
+               DMI_MATCH(DMI_PRODUCT_NAME, "MS-7721"),
+               },
+       },
        { },
 };