Commit 04ad927c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-6.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fixes from Rafael Wysocki:
 "Add ACPI backlight handling quirks for 3 machines (Hans de Goede)"

* tag 'acpi-6.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: video: Add backlight=native DMI quirk for Asus U46E
  ACPI: video: Add backlight=native DMI quirk for HP EliteBook 8460p
  ACPI: video: Add backlight=native DMI quirk for HP Pavilion g6-1d80nr
parents 274d2f8b e6b3086f

drivers/acpi/video_detect.c

+25 −0
Original line number Diff line number Diff line
@@ -590,6 +590,14 @@ static const struct dmi_system_id video_detect_dmi_table[] = { 
		DMI_MATCH(DMI_PRODUCT_NAME, "GA503"),

		},

	},

	{

	 .callback = video_detect_force_native,

	 /* Asus U46E */

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),

		DMI_MATCH(DMI_PRODUCT_NAME, "U46E"),

		},

	},

	{

	 .callback = video_detect_force_native,

	 /* Asus UX303UB */
@@ -598,6 +606,23 @@ static const struct dmi_system_id video_detect_dmi_table[] = { 
		DMI_MATCH(DMI_PRODUCT_NAME, "UX303UB"),

		},

	},

	{

	 .callback = video_detect_force_native,

	 /* HP EliteBook 8460p */

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

		DMI_MATCH(DMI_PRODUCT_NAME, "HP EliteBook 8460p"),

		},

	},

	{

	 .callback = video_detect_force_native,

	 /* HP Pavilion g6-1d80nr / B4U19UA */

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

		DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion g6 Notebook PC"),

		DMI_MATCH(DMI_PRODUCT_SKU, "B4U19UA"),

		},

	},

	{

	 .callback = video_detect_force_native,

	 /* Samsung N150P */