ACPI: video: Remove desktops without backlight DMI quirks

[ Upstream commit abe4f5ae5efa6a63c7d5abfa07eb02bb56b4654e ]

After the recent backlight changes acpi_video# backlight devices are only
registered when explicitly requested from the cmdline, by DMI quirk or by
the GPU driver.

This means that we no longer get false-positive backlight control support
advertised on desktop boards.

Remove the 3 DMI quirks for desktop boards where the false-positive issue
was fixed through quirks before. Note many more desktop boards were
affected but we never build a full quirk list for this.

Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index 0556c4720d3fa79fb2eb4c4de4a899a88602e3be..b6d429a2bcb6279bd331b2d07d239103d9070eaa 100644 (file)
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -130,12 +130,6 @@ static int video_detect_force_native(const struct dmi_system_id *d)
        return 0;
 }
 
-static int video_detect_force_none(const struct dmi_system_id *d)
-{
-       acpi_backlight_dmi = acpi_backlight_none;
-       return 0;
-}
-
 static const struct dmi_system_id video_detect_dmi_table[] = {
        /*
         * Models which should use the vendor backlight interface,
@@ -752,35 +746,6 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
                DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 15 3535"),
                },
        },
-
-       /*
-        * Desktops which falsely report a backlight and which our heuristics
-        * for this do not catch.
-        */
-       {
-        .callback = video_detect_force_none,
-        /* Dell OptiPlex 9020M */
-        .matches = {
-               DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-               DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 9020M"),
-               },
-       },
-       {
-        .callback = video_detect_force_none,
-        /* GIGABYTE GB-BXBT-2807 */
-        .matches = {
-               DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
-               DMI_MATCH(DMI_PRODUCT_NAME, "GB-BXBT-2807"),
-               },
-       },
-       {
-        .callback = video_detect_force_none,
-        /* MSI MS-7721 */
-        .matches = {
-               DMI_MATCH(DMI_SYS_VENDOR, "MSI"),
-               DMI_MATCH(DMI_PRODUCT_NAME, "MS-7721"),
-               },
-       },
        { },
 };