[PATCH] drm/amd: Adjust ASPM support quirk to cover more Intel hosts

[PATCH] drm/amd: Adjust ASPM support quirk to cover more Intel hosts

[Mario Limonciello]

Some of the same issues identified in commit c770ef19673fb
("drm/amd/amdgpu: disable ASPM in some situations") also affect
Tiger Lake systems with GFX11 connected over USB4. Widen the net
to also match these hosts.

Fixes: d9b3a066dfcd3 ("drm/amd: Exclude dGPUs in eGPU enclosures from DPM quirks")
Closes: https://gitlab.freedesktop.org/drm/amd/-/work_items/5145
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index bc7e96b58d3fc..b11c4b5fa8fcd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1334,18 +1334,15 @@ static bool amdgpu_device_aspm_support_quirk(struct amdgpu_device *adev)
 #if IS_ENABLED(CONFIG_X86)
 	struct cpuinfo_x86 *c = &cpu_data(0);
 
-	if (!(amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(12, 0, 0) ||
-		  amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(12, 0, 1)))
-		return false;
-
-	if (c->x86 == 6 &&
-		adev->pm.pcie_gen_mask & CAIL_PCIE_LINK_SPEED_SUPPORT_GEN5) {
+	if (c->x86_vendor == X86_VENDOR_INTEL) {
 		switch (c->x86_model) {
 		case VFM_MODEL(INTEL_ALDERLAKE):
 		case VFM_MODEL(INTEL_ALDERLAKE_L):
 		case VFM_MODEL(INTEL_RAPTORLAKE):
 		case VFM_MODEL(INTEL_RAPTORLAKE_P):
 		case VFM_MODEL(INTEL_RAPTORLAKE_S):
+		case VFM_MODEL(INTEL_TIGERLAKE):
+		case VFM_MODEL(INTEL_TIGERLAKE_L):
 			return true;
 		default:
 			return false;
-- 
2.43.0

Re: [PATCH] drm/amd: Adjust ASPM support quirk to cover more Intel hosts

[Timur Kristóf]

On Sunday, April 19, 2026 6:16:52 AM Central European Summer Time Mario 
Limonciello wrote:
> Some of the same issues identified in commit c770ef19673fb
> ("drm/amd/amdgpu: disable ASPM in some situations") also affect
> Tiger Lake systems with GFX11 connected over USB4. Widen the net
> to also match these hosts.

Wouldn't it be better to check that the connection is through USB4 rather than 
entirely disable ASPM accross all these families of CPUs?

> 
> Fixes: d9b3a066dfcd3 ("drm/amd: Exclude dGPUs in eGPU enclosures from DPM
> quirks") Closes: https://gitlab.freedesktop.org/drm/amd/-/work_items/5145
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index
> bc7e96b58d3fc..b11c4b5fa8fcd 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -1334,18 +1334,15 @@ static bool amdgpu_device_aspm_support_quirk(struct
> amdgpu_device *adev) #if IS_ENABLED(CONFIG_X86)
>  	struct cpuinfo_x86 *c = &cpu_data(0);
> 
> -	if (!(amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(12, 0, 0) 
||
> -		  amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(12, 
0, 1)))
> -		return false;
> -
> -	if (c->x86 == 6 &&
> -		adev->pm.pcie_gen_mask & 
CAIL_PCIE_LINK_SPEED_SUPPORT_GEN5) {
> +	if (c->x86_vendor == X86_VENDOR_INTEL) {
>  		switch (c->x86_model) {
>  		case VFM_MODEL(INTEL_ALDERLAKE):
>  		case VFM_MODEL(INTEL_ALDERLAKE_L):
>  		case VFM_MODEL(INTEL_RAPTORLAKE):
>  		case VFM_MODEL(INTEL_RAPTORLAKE_P):
>  		case VFM_MODEL(INTEL_RAPTORLAKE_S):
> +		case VFM_MODEL(INTEL_TIGERLAKE):
> +		case VFM_MODEL(INTEL_TIGERLAKE_L):
>  			return true;
>  		default:
>  			return false;

RE: [PATCH] drm/amd: Adjust ASPM support quirk to cover more Intel hosts

[Wang, Yang(Kevin)]

[AMD Official Use Only - AMD Internal Distribution Only]

Cc @Deucher, Alexander @Feng, Kenneth,

Reviewed-by: Yang Wang <kevinyang.wang@amd.com>

Best Regards,
Kevin

-----Original Message-----
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Mario Limonciello
Sent: Sunday, April 19, 2026 12:17
To: amd-gfx@lists.freedesktop.org
Cc: Limonciello, Mario <Mario.Limonciello@amd.com>
Subject: [PATCH] drm/amd: Adjust ASPM support quirk to cover more Intel hosts

Some of the same issues identified in commit c770ef19673fb
("drm/amd/amdgpu: disable ASPM in some situations") also affect Tiger Lake systems with GFX11 connected over USB4. Widen the net to also match these hosts.

Fixes: d9b3a066dfcd3 ("drm/amd: Exclude dGPUs in eGPU enclosures from DPM quirks")
Closes: https://gitlab.freedesktop.org/drm/amd/-/work_items/5145
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index bc7e96b58d3fc..b11c4b5fa8fcd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1334,18 +1334,15 @@ static bool amdgpu_device_aspm_support_quirk(struct amdgpu_device *adev)  #if IS_ENABLED(CONFIG_X86)
        struct cpuinfo_x86 *c = &cpu_data(0);

-       if (!(amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(12, 0, 0) ||
-                 amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(12, 0, 1)))
-               return false;
-
-       if (c->x86 == 6 &&
-               adev->pm.pcie_gen_mask & CAIL_PCIE_LINK_SPEED_SUPPORT_GEN5) {
+       if (c->x86_vendor == X86_VENDOR_INTEL) {
                switch (c->x86_model) {
                case VFM_MODEL(INTEL_ALDERLAKE):
                case VFM_MODEL(INTEL_ALDERLAKE_L):
                case VFM_MODEL(INTEL_RAPTORLAKE):
                case VFM_MODEL(INTEL_RAPTORLAKE_P):
                case VFM_MODEL(INTEL_RAPTORLAKE_S):
+               case VFM_MODEL(INTEL_TIGERLAKE):
+               case VFM_MODEL(INTEL_TIGERLAKE_L):
                        return true;
                default:
                        return false;
--
2.43.0

Re: [PATCH] drm/amd: Adjust ASPM support quirk to cover more Intel hosts

[Mario Limonciello]

On 4/19/26 15:28, Timur Kristóf wrote:
> On Sunday, April 19, 2026 6:16:52 AM Central European Summer Time Mario
> Limonciello wrote:
>> Some of the same issues identified in commit c770ef19673fb
>> ("drm/amd/amdgpu: disable ASPM in some situations") also affect
>> Tiger Lake systems with GFX11 connected over USB4. Widen the net
>> to also match these hosts.
> 
> Wouldn't it be better to check that the connection is through USB4 rather than
> entirely disable ASPM accross all these families of CPUs?

Historically we've had a lot of problems with Intel hosts where the root 
ports can't handle the link changing.

I don't currently have any evidence to say the root ports used for PCIe 
tunneling are any different than root ports for tradiionally connected 
device.

So I am leaning on being more cautious here.  We can peel it back later 
if that turned out to be wrong.

> 
>>
>> Fixes: d9b3a066dfcd3 ("drm/amd: Exclude dGPUs in eGPU enclosures from DPM
>> quirks") Closes: https://gitlab.freedesktop.org/drm/amd/-/work_items/5145
>> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 9 +++------
>>   1 file changed, 3 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index
>> bc7e96b58d3fc..b11c4b5fa8fcd 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>> @@ -1334,18 +1334,15 @@ static bool amdgpu_device_aspm_support_quirk(struct
>> amdgpu_device *adev) #if IS_ENABLED(CONFIG_X86)
>>   	struct cpuinfo_x86 *c = &cpu_data(0);
>>
>> -	if (!(amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(12, 0, 0)
> ||
>> -		  amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(12,
> 0, 1)))
>> -		return false;
>> -
>> -	if (c->x86 == 6 &&
>> -		adev->pm.pcie_gen_mask &
> CAIL_PCIE_LINK_SPEED_SUPPORT_GEN5) {
>> +	if (c->x86_vendor == X86_VENDOR_INTEL) {
>>   		switch (c->x86_model) {
>>   		case VFM_MODEL(INTEL_ALDERLAKE):
>>   		case VFM_MODEL(INTEL_ALDERLAKE_L):
>>   		case VFM_MODEL(INTEL_RAPTORLAKE):
>>   		case VFM_MODEL(INTEL_RAPTORLAKE_P):
>>   		case VFM_MODEL(INTEL_RAPTORLAKE_S):
>> +		case VFM_MODEL(INTEL_TIGERLAKE):
>> +		case VFM_MODEL(INTEL_TIGERLAKE_L):
>>   			return true;
>>   		default:
>>   			return false;
> 
> 
> 
>