]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.7-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 27 Jan 2024 01:23:27 +0000 (17:23 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 27 Jan 2024 01:23:27 +0000 (17:23 -0800)
added patches:
revert-drm-amd-enable-pcie-pme-from-d3.patch

queue-6.7/revert-drm-amd-enable-pcie-pme-from-d3.patch [new file with mode: 0644]
queue-6.7/series

diff --git a/queue-6.7/revert-drm-amd-enable-pcie-pme-from-d3.patch b/queue-6.7/revert-drm-amd-enable-pcie-pme-from-d3.patch
new file mode 100644 (file)
index 0000000..038ff0a
--- /dev/null
@@ -0,0 +1,33 @@
+From stable+bounces-16051-greg=kroah.com@vger.kernel.org Fri Jan 26 17:04:13 2024
+From: Jonathan Gray <jsg@jsg.id.au>
+Date: Sat, 27 Jan 2024 12:03:59 +1100
+Subject: Revert "drm/amd: Enable PCIe PME from D3"
+To: gregkh@linuxfoundation.org
+Cc: mario.limonciello@amd.com, stable@vger.kernel.org
+Message-ID: <20240127010359.10723-1-jsg@jsg.id.au>
+
+From: Jonathan Gray <jsg@jsg.id.au>
+
+This reverts commit 05f7a3475af0faa8bf77f8637c4a40349db4f78f.
+
+duplicated a change made in 6.7
+6967741d26c87300a51b5e50d4acd104bc1a9759
+
+Cc: stable@vger.kernel.org # 6.7
+Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+@@ -2265,8 +2265,6 @@ retry_init:
+               pci_wake_from_d3(pdev, TRUE);
+-              pci_wake_from_d3(pdev, TRUE);
+-
+               /*
+                * For runpm implemented via BACO, PMFW will handle the
+                * timing for BACO in and out:
index 27dba2b6e212ba23ae1ffb48f8a1d6c5174dbaa9..f8de7866666c52ee8119f802a23c3d8f80defa5f 100644 (file)
@@ -137,6 +137,7 @@ serial-sc16is7xx-improve-do-while-loop-in-sc16is7xx_irq.patch
 mm-page_alloc-unreserve-highatomic-page-blocks-before-oom.patch
 ksmbd-set-v2-lease-version-on-lease-upgrade.patch
 wifi-ath11k-rely-on-mac80211-debugfs-handling-for-vif.patch
+revert-drm-amd-enable-pcie-pme-from-d3.patch
 ksmbd-fix-potential-circular-locking-issue-in-smb2_set_ea.patch
 ksmbd-don-t-increment-epoch-if-current-state-and-request-state-are-same.patch
 ksmbd-send-lease-break-notification-on-file_rename_information.patch