Merge back new ACPI backlight material for v6.7. (c9aa36fa) · Commits · git / linux-net

drivers/acpi/video_detect.c

+50 −8

Original line number	Diff line number	Diff line
		@@ -229,14 +229,6 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
		DMI_MATCH(DMI_BOARD_NAME, "NC210/NC110"),
		},
		},
		{
		.callback = video_detect_force_vendor,
		/* Xiaomi Mi Pad 2 */
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Xiaomi Inc"),
		DMI_MATCH(DMI_PRODUCT_NAME, "Mipad2"),
		},
		},

		/*
		* Models which should use the vendor backlight interface,
		@@ -799,6 +791,56 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
		DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 15 3535"),
		},
		},

		/*
		* x86 android tablets which directly control the backlight through
		* an external backlight controller, typically TI's LP8557.
		* The backlight is directly controlled by the lp855x driver on these.
		* This setup means that neither i915's native nor acpi_video backlight
		* control works. Add a "vendor" quirk to disable both. Note these
		* devices do not use vendor control in the typical meaning of
		* vendor specific SMBIOS or ACPI calls being used.
		*/
		{
		.callback = video_detect_force_vendor,
		/* Lenovo Yoga Book X90F / X90L */
		.matches = {
		DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),
		DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "CHERRYVIEW D1 PLATFORM"),
		DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "YETI-11"),
		},
		},
		{
		.callback = video_detect_force_vendor,
		/*
		* Lenovo Yoga Tablet 2 830F/L or 1050F/L (The 8" and 10"
		* Lenovo Yoga Tablet 2 use the same mainboard)
		*/
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Intel Corp."),
		DMI_MATCH(DMI_PRODUCT_NAME, "VALLEYVIEW C0 PLATFORM"),
		DMI_MATCH(DMI_BOARD_NAME, "BYT-T FFD8"),
		/* Partial match on beginning of BIOS version */
		DMI_MATCH(DMI_BIOS_VERSION, "BLADE_21"),
		},
		},
		{
		.callback = video_detect_force_vendor,
		/* Lenovo Yoga Tab 3 Pro YT3-X90F */
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),
		DMI_MATCH(DMI_PRODUCT_NAME, "CHERRYVIEW D1 PLATFORM"),
		DMI_MATCH(DMI_PRODUCT_VERSION, "Blade3-10A-001"),
		},
		},
		{
		.callback = video_detect_force_vendor,
		/* Xiaomi Mi Pad 2 */
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Xiaomi Inc"),
		DMI_MATCH(DMI_PRODUCT_NAME, "Mipad2"),
		},
		},
		{ },
		};