[SRU][OEM-5.10][PATCH 6/6] Revert "UBUNTU: SAUCE: ACPI: avoid NVIDIA GPU fallen with an _OSI string"

[chris.chiu at canonical.com]

From: Chris Chiu <chris.chiu at canonical.com>

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

This reverts commit b6965f5318b70502e85f2dc66c7cfee2a56b31fa.
The _OSI string "Linux-Dell-USB4-NVWakeup" is no longer needed for the
BIOS after i915 force TypeC PHY disconnect during suspend/shutdown.

Signed-off-by: Chris Chiu <chris.chiu at canonical.com>
---
 drivers/acpi/osi.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/acpi/osi.c b/drivers/acpi/osi.c
index d56a0cbbbac8..69f8820cd0a7 100644
--- a/drivers/acpi/osi.c
+++ b/drivers/acpi/osi.c
@@ -74,13 +74,6 @@ osi_setup_entries[OSI_STRING_ENTRIES_MAX] __initdata = {
 	 * are going to s2idle.
 	 */
 	{"Linux-Dell-USB4-Wakeup", true},
-	/*
-	 * Linux-Dell-USB4-NVWakeup is used by BIOS to skip the Intel Reference
-	 * ACPI method PGSC which is used for clock source control of the
-	 * PCIe root port of the NV GPU on Tigerlake-H. Keep the clock source
-	 * on to avoid the power transition fail during enter/exit s2idle.
-	 */
-	{"Linux-Dell-USB4-NVWakeup", true},
 };
 
 static u32 acpi_osi_handler(acpi_string interface, u32 supported)
-- 
2.25.1