This is a note to let you know that I've just added the patch titled

    drm/amd: Disable ASPM on SI

to the 6.12-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-amd-disable-aspm-on-si.patch
and it can be found in the queue-6.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.


>From [email protected] Wed Apr  1 02:40:16 
>2026
From: Rosen Penev <[email protected]>
Date: Tue, 31 Mar 2026 17:39:07 -0700
Subject: drm/amd: Disable ASPM on SI
To: [email protected]
Cc: "Alex Deucher" <[email protected]>, "Christian König" 
<[email protected]>, "Xinhui Pan" <[email protected]>, "David Airlie" 
<[email protected]>, "Simona Vetter" <[email protected]>, "Harry Wentland" 
<[email protected]>, "Leo Li" <[email protected]>, "Rodrigo Siqueira" 
<[email protected]>, "Ray Wu" <[email protected]>, "Wayne Lin" 
<[email protected]>, "Mario Limonciello" <[email protected]>, "Roman 
Li" <[email protected]>, "Eric Yang" <[email protected]>, "Tony Cheng" 
<[email protected]>, "Mauro Rossi" <[email protected]>, "Timur Kristóf" 
<[email protected]>, "Alex Hung" <[email protected]>, 
[email protected] (open list:RADEON and AMDGPU DRM DRIVERS), 
[email protected] (open list:DRM DRIVERS), 
[email protected] (open list)
Message-ID: <[email protected]>

From: Timur Kristóf <[email protected]>

[ Upstream commit 7bdd91abf0cb3ea78160e2e78fb58b12f6a38d55 ]

Enabling ASPM causes randoms hangs on Tahiti and Oland on Zen4.
It's unclear if this is a platform-specific or GPU-specific issue.
Disable ASPM on SI for the time being.

Reviewed-by: Alex Deucher <[email protected]>
Signed-off-by: Timur Kristóf <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Signed-off-by: Rosen Penev <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1761,6 +1761,13 @@ static bool amdgpu_device_pcie_dynamic_s
 
 static bool amdgpu_device_aspm_support_quirk(struct amdgpu_device *adev)
 {
+       /* Enabling ASPM causes randoms hangs on Tahiti and Oland on Zen4.
+        * It's unclear if this is a platform-specific or GPU-specific issue.
+        * Disable ASPM on SI for the time being.
+        */
+       if (adev->family == AMDGPU_FAMILY_SI)
+               return true;
+
 #if IS_ENABLED(CONFIG_X86)
        struct cpuinfo_x86 *c = &cpu_data(0);
 


Patches currently in stable-queue which might be from [email protected] are

queue-6.12/drm-amd-amdgpu-decouple-aspm-with-pcie-dpm.patch
queue-6.12/drm-amd-display-reject-modes-with-too-high-pixel-clock-on-dce6-10.patch
queue-6.12/drm-amd-display-fix-dce-6.0-and-6.4-pll-programming.patch
queue-6.12/drm-amd-display-disable-scaling-on-dce6-for-now.patch
queue-6.12/drm-amd-display-disable-fastboot-on-dce-6-too.patch
queue-6.12/drm-amd-display-correct-logic-check-error-for-fastboot.patch
queue-6.12/drm-amd-amdgpu-disable-aspm-in-some-situations.patch
queue-6.12/drm-amd-display-keep-pll0-running-on-dce-6.0-and-6.4.patch
queue-6.12/drm-amd-display-adjust-dce-8-10-clock-don-t-overclock-by-15.patch
queue-6.12/drm-amd-disable-aspm-on-si.patch

Reply via email to