From: Greg Kroah-Hartman Date: Fri, 27 Oct 2023 15:37:02 +0000 (+0200) Subject: drop queue-5.15/drm-amd-disable-aspm-for-vi-w-all-intel-systems.patch X-Git-Tag: v6.1.61~69 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29d979684bacc37dd360cedd0624f72d3687e2ef;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.15/drm-amd-disable-aspm-for-vi-w-all-intel-systems.patch --- diff --git a/queue-5.15/drm-amd-disable-aspm-for-vi-w-all-intel-systems.patch b/queue-5.15/drm-amd-disable-aspm-for-vi-w-all-intel-systems.patch deleted file mode 100644 index f802fac7c38..00000000000 --- a/queue-5.15/drm-amd-disable-aspm-for-vi-w-all-intel-systems.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 64ffd2f1d00c6235dabe9704bbb0d9ce3e28147f Mon Sep 17 00:00:00 2001 -From: Mario Limonciello -Date: Fri, 20 Oct 2023 10:26:29 -0500 -Subject: drm/amd: Disable ASPM for VI w/ all Intel systems - -From: Mario Limonciello - -commit 64ffd2f1d00c6235dabe9704bbb0d9ce3e28147f upstream. - -Originally we were quirking ASPM disabled specifically for VI when -used with Alder Lake, but it appears to have problems with Rocket -Lake as well. - -Like we've done in the case of dpm for newer platforms, disable -ASPM for all Intel systems. - -Cc: stable@vger.kernel.org # 5.15+ -Fixes: 0064b0ce85bb ("drm/amd/pm: enable ASPM by default") -Reported-and-tested-by: Paolo Gentili -Closes: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2036742 -Signed-off-by: Mario Limonciello -Reviewed-by: Alex Deucher -Signed-off-by: Alex Deucher -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/amd/amdgpu/vi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/gpu/drm/amd/amdgpu/vi.c -+++ b/drivers/gpu/drm/amd/amdgpu/vi.c -@@ -1147,7 +1147,7 @@ static void vi_program_aspm(struct amdgp - bool bL1SS = false; - bool bClkReqSupport = true; - -- if (!amdgpu_device_should_use_aspm(adev) || !amdgpu_device_aspm_support_quirk()) -+ if (!amdgpu_device_should_use_aspm(adev) || !amdgpu_device_pcie_dynamic_switching_supported()) - return; - - if (adev->flags & AMD_IS_APU || diff --git a/queue-5.15/series b/queue-5.15/series index dcada519ed0..8fb515799a8 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -27,4 +27,3 @@ mm-page_alloc-correct-start-page-when-guard-page-debug-is-enabled.patch mm-migrate-fix-do_pages_move-for-compat-pointers.patch nfsd-lock_rename-needs-both-directories-to-live-on-the-same-fs.patch drm-i915-pmu-check-if-pmu-is-closed-before-stopping-event.patch -drm-amd-disable-aspm-for-vi-w-all-intel-systems.patch