[OEM-5.10] [PATCH 01/17] Revert "UBUNTU: SAUCE: platform/x86: force LPS0 functions for AMD"

Kai-Heng Feng kai.heng.feng at canonical.com
Tue Jun 22 17:23:36 UTC 2021


BugLink: https://bugs.launchpad.net/bugs/1932577

This reverts commit 4d2d25cf44fe993ebeaad8cc79d164f40c451f7b.

Signed-off-by: Kai-Heng Feng <kai.heng.feng at canonical.com>
---
 drivers/acpi/sleep.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 36646af15e0a..a87a874b9a77 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -1054,13 +1054,6 @@ static int lps0_device_attach(struct acpi_device *adev,
 
 	ACPI_FREE(out_obj);
 
-	/*
-	 * Some HP laptops require ACPI_LPS0_ENTRY_AMD/ACPI_LPS0_EXIT_AMD for proper
-	 * S0ix, but don't set the function mask correctly.  Fix that up here.
-	 */
-	if (acpi_match_vendor_name())
-		lps0_dsm_func_mask |= (1 << ACPI_LPS0_ENTRY_AMD) | (1 << ACPI_LPS0_EXIT_AMD);
-
 	acpi_handle_debug(adev->handle, "_DSM function mask: 0x%x\n",
 			  lps0_dsm_func_mask);
 
-- 
2.31.1




More information about the kernel-team mailing list