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

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

Pull ACPI fixes from Rafael Wysocki:
 "These are new ACPI IRQ override quirks, low-power S0 idle (S0ix)
  support adjustments and ACPI backlight handling fixes, mostly for
  platforms using AMD chips.

  Specifics:

   - Add ACPI IRQ override quirks for Asus ExpertBook B2502, Lenovo
     14ALC7, and XMG Core 15 (Hans de Goede, Adrian Freund, Erik
     Schumacher).

   - Adjust ACPI video detection fallback path to prevent
     non-operational ACPI backlight devices from being created on
     systems where the native driver does not detect a suitable panel
     (Mario Limonciello).

   - Fix Apple GMUX backlight detection (Hans de Goede).

   - Add a low-power S0 idle (S0ix) handling quirk for HP Elitebook 865
     and stop using AMD-specific low-power S0 idle code path for systems
     with Rembrandt chips and newer (Mario Limonciello)"

* tag 'acpi-6.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: x86: s2idle: Stop using AMD specific codepath for Rembrandt+
  ACPI: x86: s2idle: Force AMD GUID/_REV 2 on HP Elitebook 865
  ACPI: video: Fix Apple GMUX backlight detection
  ACPI: resource: Add Asus ExpertBook B2502 to Asus quirks
  ACPI: resource: do IRQ override on Lenovo 14ALC7
  ACPI: resource: do IRQ override on XMG Core 15
  ACPI: video: Don't enable fallback path for creating ACPI backlight by default
  drm/amd/display: Report to ACPI video if no panels were found
  ACPI: video: Allow GPU drivers to report no panels
parents 262eef26 0948a9ef

drivers/acpi/acpi_video.c

+12 −5
Original line number Diff line number Diff line
@@ -70,11 +70,7 @@ module_param(device_id_scheme, bool, 0444); 
static int only_lcd = -1;

module_param(only_lcd, int, 0444);



/*

 * Display probing is known to take up to 5 seconds, so delay the fallback

 * backlight registration by 5 seconds + 3 seconds for some extra margin.

 */

static int register_backlight_delay = 8;

static int register_backlight_delay;

module_param(register_backlight_delay, int, 0444);

MODULE_PARM_DESC(register_backlight_delay,

	"Delay in seconds before doing fallback (non GPU driver triggered) "
@@ -2176,6 +2172,17 @@ static bool should_check_lcd_flag(void) 
	return false;

}



/*

 * At least one graphics driver has reported that no LCD is connected

 * via the native interface. cancel the registration for fallback acpi_video0.

 * If another driver still deems this necessary, it can explicitly register it.

 */

void acpi_video_report_nolcd(void)

{

	cancel_delayed_work(&video_bus_register_backlight_work);

}

EXPORT_SYMBOL(acpi_video_report_nolcd);



int acpi_video_register(void)

{

	int ret = 0;

drivers/acpi/resource.c

+29 −3
Original line number Diff line number Diff line
@@ -432,10 +432,24 @@ static const struct dmi_system_id asus_laptop[] = { 
			DMI_MATCH(DMI_BOARD_NAME, "S5602ZA"),

		},

	},

	{

		.ident = "Asus ExpertBook B2502",

		.matches = {

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

			DMI_MATCH(DMI_BOARD_NAME, "B2502CBA"),

		},

	},

	{ }

};



static const struct dmi_system_id lenovo_82ra[] = {

static const struct dmi_system_id lenovo_laptop[] = {

	{

		.ident = "LENOVO IdeaPad Flex 5 14ALC7",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "82R9"),

		},

	},

	{

		.ident = "LENOVO IdeaPad Flex 5 16ALC7",

		.matches = {
@@ -446,6 +460,17 @@ static const struct dmi_system_id lenovo_82ra[] = { 
	{ }

};



static const struct dmi_system_id schenker_gm_rg[] = {

	{

		.ident = "XMG CORE 15 (M22)",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "SchenkerTechnologiesGmbH"),

			DMI_MATCH(DMI_BOARD_NAME, "GMxRGxx"),

		},

	},

	{ }

};



struct irq_override_cmp {

	const struct dmi_system_id *system;

	unsigned char irq;
@@ -458,8 +483,9 @@ struct irq_override_cmp { 
static const struct irq_override_cmp override_table[] = {

	{ medion_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, false },

	{ asus_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, false },

	{ lenovo_82ra, 6, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, true },

	{ lenovo_82ra, 10, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, true },

	{ lenovo_laptop, 6, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, true },

	{ lenovo_laptop, 10, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, true },

	{ schenker_gm_rg, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1, true },

};



static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity,

drivers/acpi/video_detect.c

+22 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/module.h>

#include <linux/pci.h>

#include <linux/platform_data/x86/nvidia-wmi-ec-backlight.h>

#include <linux/pnp.h>

#include <linux/types.h>

#include <linux/workqueue.h>

#include <acpi/video.h>
@@ -105,6 +106,26 @@ static bool nvidia_wmi_ec_supported(void) 
}

#endif



static bool apple_gmux_backlight_present(void)

{

	struct acpi_device *adev;

	struct device *dev;



	adev = acpi_dev_get_first_match_dev(GMUX_ACPI_HID, NULL, -1);

	if (!adev)

		return false;



	dev = acpi_get_first_physical_node(adev);

	if (!dev)

		return false;



	/*

	 * drivers/platform/x86/apple-gmux.c only supports old style

	 * Apple GMUX with an IO-resource.

	 */

	return pnp_get_resource(to_pnp_dev(dev), IORESOURCE_IO, 0) != NULL;

}



/* Force to use vendor driver when the ACPI device is known to be

 * buggy */

static int video_detect_force_vendor(const struct dmi_system_id *d)
@@ -767,7 +788,7 @@ static enum acpi_backlight_type __acpi_video_get_backlight_type(bool native) 
	if (nvidia_wmi_ec_present)

		return acpi_backlight_nvidia_wmi_ec;



	if (apple_gmux_present())

	if (apple_gmux_backlight_present())

		return acpi_backlight_apple_gmux;



	/* Use ACPI video if available, except when native should be preferred. */

drivers/acpi/x86/s2idle.c

+13 −74
Original line number Diff line number Diff line
@@ -28,10 +28,6 @@ static bool sleep_no_lps0 __read_mostly; 
module_param(sleep_no_lps0, bool, 0644);

MODULE_PARM_DESC(sleep_no_lps0, "Do not use the special LPS0 device interface");



static bool prefer_microsoft_dsm_guid __read_mostly;

module_param(prefer_microsoft_dsm_guid, bool, 0644);

MODULE_PARM_DESC(prefer_microsoft_dsm_guid, "Prefer using Microsoft GUID in LPS0 device _DSM evaluation");



static const struct acpi_device_id lps0_device_ids[] = {

	{"PNP0D80", },

	{"", },
@@ -369,27 +365,15 @@ static int validate_dsm(acpi_handle handle, const char *uuid, int rev, guid_t *d 
}



struct amd_lps0_hid_device_data {

	const unsigned int rev_id;

	const bool check_off_by_one;

	const bool prefer_amd_guid;

};



static const struct amd_lps0_hid_device_data amd_picasso = {

	.rev_id = 0,

	.check_off_by_one = true,

	.prefer_amd_guid = false,

};



static const struct amd_lps0_hid_device_data amd_cezanne = {

	.rev_id = 0,

	.check_off_by_one = false,

	.prefer_amd_guid = false,

};



static const struct amd_lps0_hid_device_data amd_rembrandt = {

	.rev_id = 2,

	.check_off_by_one = false,

	.prefer_amd_guid = true,

};



static const struct acpi_device_id amd_hid_ids[] = {
@@ -397,69 +381,27 @@ static const struct acpi_device_id amd_hid_ids[] = { 
	{"AMD0005",	(kernel_ulong_t)&amd_picasso,	},

	{"AMDI0005",	(kernel_ulong_t)&amd_picasso,	},

	{"AMDI0006",	(kernel_ulong_t)&amd_cezanne,	},

	{"AMDI0007",	(kernel_ulong_t)&amd_rembrandt,	},

	{}

};



static int lps0_prefer_microsoft(const struct dmi_system_id *id)

static int lps0_prefer_amd(const struct dmi_system_id *id)

{

	pr_debug("Preferring Microsoft GUID.\n");

	prefer_microsoft_dsm_guid = true;

	pr_debug("Using AMD GUID w/ _REV 2.\n");

	rev_id = 2;

	return 0;

}



static const struct dmi_system_id s2idle_dmi_table[] __initconst = {

	{

		/*

		 * ASUS TUF Gaming A17 FA707RE

		 * https://bugzilla.kernel.org/show_bug.cgi?id=216101

		 */

		.callback = lps0_prefer_microsoft,

		.matches = {

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

			DMI_MATCH(DMI_PRODUCT_NAME, "ASUS TUF Gaming A17"),

		},

	},

	{

		/* ASUS ROG Zephyrus G14 (2022) */

		.callback = lps0_prefer_microsoft,

		.matches = {

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

			DMI_MATCH(DMI_PRODUCT_NAME, "ROG Zephyrus G14 GA402"),

		},

	},

	{

		/*

		 * Lenovo Yoga Slim 7 Pro X 14ARH7

		 * https://bugzilla.kernel.org/show_bug.cgi?id=216473 : 82V2

		 * https://bugzilla.kernel.org/show_bug.cgi?id=216438 : 82TL

		 */

		.callback = lps0_prefer_microsoft,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "82"),

		},

	},

	{

		/*

		 * ASUSTeK COMPUTER INC. ROG Flow X13 GV301RE_GV301RE

		 * https://gitlab.freedesktop.org/drm/amd/-/issues/2148

		 */

		.callback = lps0_prefer_microsoft,

		.matches = {

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

			DMI_MATCH(DMI_PRODUCT_NAME, "ROG Flow X13 GV301"),

		},

	},

	{

		/*

		 * ASUSTeK COMPUTER INC. ROG Flow X16 GV601RW_GV601RW

		 * https://gitlab.freedesktop.org/drm/amd/-/issues/2148

		 * AMD Rembrandt based HP EliteBook 835/845/865 G9

		 * Contains specialized AML in AMD/_REV 2 path to avoid

		 * triggering a bug in Qualcomm WLAN firmware. This may be

		 * removed in the future if that firmware is fixed.

		 */

		.callback = lps0_prefer_microsoft,

		.callback = lps0_prefer_amd,

		.matches = {

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

			DMI_MATCH(DMI_PRODUCT_NAME, "ROG Flow X16 GV601"),

			DMI_MATCH(DMI_BOARD_VENDOR, "HP"),

			DMI_MATCH(DMI_BOARD_NAME, "8990"),

		},

	},

	{}
@@ -484,16 +426,14 @@ static int lps0_device_attach(struct acpi_device *adev, 
		if (dev_id->id[0])

			data = (const struct amd_lps0_hid_device_data *) dev_id->driver_data;

		else

			data = &amd_rembrandt;

		rev_id = data->rev_id;

			data = &amd_cezanne;

		lps0_dsm_func_mask = validate_dsm(adev->handle,

					ACPI_LPS0_DSM_UUID_AMD, rev_id, &lps0_dsm_guid);

		if (lps0_dsm_func_mask > 0x3 && data->check_off_by_one) {

			lps0_dsm_func_mask = (lps0_dsm_func_mask << 1) | 0x1;

			acpi_handle_debug(adev->handle, "_DSM UUID %s: Adjusted function mask: 0x%x\n",

					  ACPI_LPS0_DSM_UUID_AMD, lps0_dsm_func_mask);

		} else if (lps0_dsm_func_mask_microsoft > 0 && data->prefer_amd_guid &&

				!prefer_microsoft_dsm_guid) {

		} else if (lps0_dsm_func_mask_microsoft > 0 && rev_id) {

			lps0_dsm_func_mask_microsoft = -EINVAL;

			acpi_handle_debug(adev->handle, "_DSM Using AMD method\n");

		}
@@ -501,7 +441,6 @@ static int lps0_device_attach(struct acpi_device *adev, 
		rev_id = 1;

		lps0_dsm_func_mask = validate_dsm(adev->handle,

					ACPI_LPS0_DSM_UUID, rev_id, &lps0_dsm_guid);

		if (!prefer_microsoft_dsm_guid)

		lps0_dsm_func_mask_microsoft = -EINVAL;

	}

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+4 −0
Original line number Diff line number Diff line
@@ -4361,6 +4361,10 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 
		amdgpu_set_panel_orientation(&aconnector->base);

	}



	/* If we didn't find a panel, notify the acpi video detection */

	if (dm->adev->flags & AMD_IS_APU && dm->num_of_edps == 0)

		acpi_video_report_nolcd();



	/* Software is initialized. Now we can register interrupt handlers. */

	switch (adev->asic_type) {

#if defined(CONFIG_DRM_AMD_DC_SI)