Commit cdbbca25 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ACPI fixes from Rafael Wysocki:
 "These add one more ACPI IRQ override quirk, improve ACPI companion
  lookup for backlight devices and add missing kernel command line
  option values for backlight detection.

  Specifics:

   - Improve ACPI companion lookup for backlight devices in the cases
     when there is more than one candidate ACPI device object (Hans de
     Goede)

   - 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)

   - Skip ACPI IRQ override on Asus Expertbook B2402CBA (Tamim Khan)"

* tag 'acpi-6.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: Fix selecting wrong ACPI fwnode for the iGPU on some Dell laptops
  ACPI: video: Allow selecting NVidia-WMI-EC or Apple GMUX backlight from the cmdline
  ACPI: resource: Skip IRQ override on Asus Expertbook B2402CBA
parents 0d0833e0 df3a71ab

drivers/acpi/glue.c

+12 −2
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ static struct acpi_bus_type *acpi_get_bus_type(struct device *dev) 
}



#define FIND_CHILD_MIN_SCORE	1

#define FIND_CHILD_MAX_SCORE	2

#define FIND_CHILD_MID_SCORE	2

#define FIND_CHILD_MAX_SCORE	3



static int match_any(struct acpi_device *adev, void *not_used)

{
@@ -96,8 +97,17 @@ static int find_child_checks(struct acpi_device *adev, bool check_children) 
		return -ENODEV;



	status = acpi_evaluate_integer(adev->handle, "_STA", NULL, &sta);

	if (status == AE_NOT_FOUND)

	if (status == AE_NOT_FOUND) {

		/*

		 * Special case: backlight device objects without _STA are

		 * preferred to other objects with the same _ADR value, because

		 * it is more likely that they are actually useful.

		 */

		if (adev->pnp.type.backlight)

			return FIND_CHILD_MID_SCORE;



		return FIND_CHILD_MIN_SCORE;

	}



	if (ACPI_FAILURE(status) || !(sta & ACPI_STA_DEVICE_ENABLED))

		return -ENODEV;

drivers/acpi/resource.c

+7 −0
Original line number Diff line number Diff line
@@ -432,6 +432,13 @@ static const struct dmi_system_id asus_laptop[] = { 
			DMI_MATCH(DMI_BOARD_NAME, "S5602ZA"),

		},

	},

	{

		.ident = "Asus ExpertBook B2402CBA",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_BOARD_NAME, "B2402CBA"),

		},

	},

	{

		.ident = "Asus ExpertBook B2502",

		.matches = {

drivers/acpi/scan.c

+5 −2
Original line number Diff line number Diff line
@@ -1370,9 +1370,12 @@ static void acpi_set_pnp_ids(acpi_handle handle, struct acpi_device_pnp *pnp, 
		 * Some devices don't reliably have _HIDs & _CIDs, so add

		 * synthetic HIDs to make sure drivers can find them.

		 */

		if (acpi_is_video_device(handle))

		if (acpi_is_video_device(handle)) {

			acpi_add_id(pnp, ACPI_VIDEO_HID);

		else if (acpi_bay_match(handle))

			pnp->type.backlight = 1;

			break;

		}

		if (acpi_bay_match(handle))

			acpi_add_id(pnp, ACPI_BAY_HID);

		else if (acpi_dock_match(handle))

			acpi_add_id(pnp, ACPI_DOCK_HID);

drivers/acpi/video_detect.c

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ static void acpi_video_parse_cmdline(void) 
		acpi_backlight_cmdline = acpi_backlight_video;

	if (!strcmp("native", acpi_video_backlight_string))

		acpi_backlight_cmdline = acpi_backlight_native;

	if (!strcmp("nvidia_wmi_ec", acpi_video_backlight_string))

		acpi_backlight_cmdline = acpi_backlight_nvidia_wmi_ec;

	if (!strcmp("apple_gmux", acpi_video_backlight_string))

		acpi_backlight_cmdline = acpi_backlight_apple_gmux;

	if (!strcmp("none", acpi_video_backlight_string))

		acpi_backlight_cmdline = acpi_backlight_none;

}

include/acpi/acpi_bus.h

+2 −1
Original line number Diff line number Diff line
@@ -230,7 +230,8 @@ struct acpi_pnp_type { 
	u32 hardware_id:1;

	u32 bus_address:1;

	u32 platform_id:1;

	u32 reserved:29;

	u32 backlight:1;

	u32 reserved:28;

};



struct acpi_device_pnp {