[Public] > -----Original Message----- > From: Deucher, Alexander <Alexander.Deucher@xxxxxxx> > Sent: Monday, October 23, 2023 09:22 > To: Limonciello, Mario <Mario.Limonciello@xxxxxxx>; amd- > gfx@xxxxxxxxxxxxxxxxxxxxx > Cc: Limonciello, Mario <Mario.Limonciello@xxxxxxx>; > paolo.gentili@xxxxxxxxxxxxx > Subject: RE: [PATCH] drm/amd: Disable ASPM for VI w/ all Intel systems > > [Public] > > > -----Original Message----- > > From: amd-gfx <amd-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of > Mario > > Limonciello > > Sent: Monday, October 23, 2023 9:45 AM > > To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx > > Cc: Limonciello, Mario <Mario.Limonciello@xxxxxxx>; > > paolo.gentili@xxxxxxxxxxxxx > > Subject: [PATCH] drm/amd: Disable ASPM for VI w/ all Intel systems > > > > 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@xxxxxxxxxxxxxxx # 5.15+ > > Fixes: 0064b0ce85bb ("drm/amd/pm: enable ASPM by default") > > Reported-and-tested-by: Paolo Gentili <paolo.gentili@xxxxxxxxxxxxx> > > Closes: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2036742 > > Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx> > > Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx> > > As a follow on, we probably want to apply this to all of the program_aspm() > functions for each asic family. > Yeah; I had that thought too but wanted to have a narrow patch for fixes and stable first. I will merge and send a follow up for that. > Alex > > > --- > > drivers/gpu/drm/amd/amdgpu/vi.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c > > b/drivers/gpu/drm/amd/amdgpu/vi.c index 6a8494f98d3e..fe8ba9e9837b > > 100644 > > --- a/drivers/gpu/drm/amd/amdgpu/vi.c > > +++ b/drivers/gpu/drm/amd/amdgpu/vi.c > > @@ -1124,7 +1124,7 @@ static void vi_program_aspm(struct > > amdgpu_device *adev) > > 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 || > > -- > > 2.34.1 >