From a548eef8bf4d9f3fc8535d1cfdc3b62b57d687f9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 26 Jan 2024 17:23:03 -0800 Subject: [PATCH] 6.6-stable patches added patches: revert-drm-amd-enable-pcie-pme-from-d3.patch --- ...vert-drm-amd-enable-pcie-pme-from-d3.patch | 33 +++++++++++++++++++ queue-6.6/series | 1 + 2 files changed, 34 insertions(+) create mode 100644 queue-6.6/revert-drm-amd-enable-pcie-pme-from-d3.patch diff --git a/queue-6.6/revert-drm-amd-enable-pcie-pme-from-d3.patch b/queue-6.6/revert-drm-amd-enable-pcie-pme-from-d3.patch new file mode 100644 index 00000000000..537981c5056 --- /dev/null +++ b/queue-6.6/revert-drm-amd-enable-pcie-pme-from-d3.patch @@ -0,0 +1,33 @@ +From stable+bounces-16050-greg=kroah.com@vger.kernel.org Fri Jan 26 17:02:00 2024 +From: Jonathan Gray +Date: Sat, 27 Jan 2024 12:01:50 +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: <20240127010150.38720-1-jsg@jsg.id.au> + +From: Jonathan Gray + +This reverts commit 847e6947afd3c46623172d2eabcfc2481ee8668e. + +duplicated a change made in 6.6.5 +49227bea27ebcd260f0c94a3055b14bbd8605c5e + +Cc: stable@vger.kernel.org # 6.6 +Signed-off-by: Jonathan Gray +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -2197,8 +2197,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: diff --git a/queue-6.6/series b/queue-6.6/series index baa3a013fe9..0d5fbc18b57 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -160,3 +160,4 @@ bpf-widening-for-callback-iterators.patch selftests-bpf-test-widening-for-iterating-callbacks.patch bpf-keep-track-of-max-number-of-bpf_loop-callback-iterations.patch selftests-bpf-check-if-max-number-of-bpf_loop-iterations-is-tracked.patch +revert-drm-amd-enable-pcie-pme-from-d3.patch -- 2.47.3