Commit 7163a211 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-6.4-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fix from Rafael Wysocki:
 "Remove an ACPI backlight quirk for Lenovo ThinkPad W530, added during
  the 6.3 cycle, that turned out to do more harm than help (Hans de
  Goede)"

* tag 'acpi-6.4-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: video: Remove acpi_backlight=video quirk for Lenovo ThinkPad W530
parents 817e1af1 3db66620

drivers/acpi/video_detect.c

+0 −14
Original line number Diff line number Diff line
@@ -293,20 +293,6 @@ static const struct dmi_system_id video_detect_dmi_table[] = { 
		},

	},



	/*

	 * Older models with nvidia GPU which need acpi_video backlight

	 * control and where the old nvidia binary driver series does not

	 * call acpi_video_register_backlight().

	 */

	{

	 .callback = video_detect_force_video,

	 /* ThinkPad W530 */

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W530"),

		},

	},



	/*

	 * These models have a working acpi_video backlight control, and using

	 * native backlight causes a regression where backlight does not work