Merge branches 'acpi-resource' and 'acpi-video'

Merge an ACPI resource management quirk and an ACPI backlight driver fix for 6.2-rc4: - Skip ACPI IRQ override on Asus Expertbook B2402CBA (Tamim Khan). - Add missing support for manual selection of NVidia-WMI-EC or Apple GMUX backlight in the kernel command line to the ACPI backlight driver (Hans de Goede). * acpi-resource: ACPI: resource: Skip IRQ override on Asus Expertbook B2402CBA * acpi-video: ACPI: video: Allow selecting NVidia-WMI-EC or Apple GMUX backlight from the cmdline

Rafael J. Wysocki committed 3 years ago

Commit df3a71a3 parents f64e427 77c7248 420a1112 files · +11 −0Browse files

Unified · Split

2 files

drivers/acpi/resource.c +7 −0
drivers/acpi/video_detect.c +4 −0

drivers/acpi/resource.c+7−0

@@ -432,6 +432,13 @@ static const struct dmi_system_id asus_laptop[] = { · 431 unmodified lines
432	432	DMI_MATCH(DMI_BOARD_NAME, "S5602ZA"),
433	433	},
434	434	},
	435	+ {
	436	+ .ident = "Asus ExpertBook B2402CBA",
	437	+ .matches = {
	438	+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
	439	+ DMI_MATCH(DMI_BOARD_NAME, "B2402CBA"),
	440	+ },
	441	+ },
435	442	{
436	443	.ident = "Asus ExpertBook B2502",
437	444	.matches = {

drivers/acpi/video_detect.c+4−0

@@ -50,6 +50,10 @@ static void acpi_video_parse_cmdline(void) · 49 unmodified lines
50	50	acpi_backlight_cmdline = acpi_backlight_video;
51	51	if (!strcmp("native", acpi_video_backlight_string))
52	52	acpi_backlight_cmdline = acpi_backlight_native;
	53	+ if (!strcmp("nvidia_wmi_ec", acpi_video_backlight_string))
	54	+ acpi_backlight_cmdline = acpi_backlight_nvidia_wmi_ec;
	55	+ if (!strcmp("apple_gmux", acpi_video_backlight_string))
	56	+ acpi_backlight_cmdline = acpi_backlight_apple_gmux;
53	57	if (!strcmp("none", acpi_video_backlight_string))
54	58	acpi_backlight_cmdline = acpi_backlight_none;
55	59	}