ACPI: video: Change GIGABYTE GB-BXBT-2807 quirk to force_none

[ Upstream commit 9f7dd272ff9338f1f43c7a837d5a7ee67811d552 ]

The GIGABYTE GB-BXBT-2807 DMI quirk was added by
commit 25417185e9b5 ("ACPI: video: Add DMI quirk for GIGABYTE
GB-BXBT-2807") which says the following in its commit message:

"The GIGABYTE GB-BXBT-2807 is a mini-PC which uses off the shelf
components, like an Intel GPU which is meant for mobile systems.
As such, it, by default, has a backlight controller exposed.

Unfortunately, the backlight controller only confuses userspace, which
sees the existence of a backlight device node and has the unrealistic
belief that there is actually a backlight there!

Add a DMI quirk to force the backlight off on this system."

So in essence this quirk was using a video_detect_force_vendor quirk
to disable backlight control. Now a days we have a specific "none"
backlight type for this. Change the quirk to video_detect_force_none
and group it together with the other force_none quirks.

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 b2a61628763879a4aac329a8c18448ad8645af9c..375d1ef8fbeac04f1e36cc8c57db49570e98505a 100644 (file)
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -197,14 +197,6 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
                DMI_MATCH(DMI_PRODUCT_NAME, "1015CX"),
                },
        },
-       {
-        .callback = video_detect_force_vendor,
-        /* GIGABYTE GB-BXBT-2807 */
-        .matches = {
-               DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
-               DMI_MATCH(DMI_PRODUCT_NAME, "GB-BXBT-2807"),
-               },
-       },
        {
         .callback = video_detect_force_vendor,
         /* Samsung N150/N210/N220 */
@@ -671,6 +663,14 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
                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 */