[AMD Official Use Only - General] Patch1, 2, 3 are reviewed-by: Evan Quan <evan.quan@xxxxxxx> For patch4, it seems not quite right(at least for the naming). Since although the ASPM is the prerequisite for pcie/lclk dpm features. But the changes involved here are really for aspm feature disablement. I mean even if pcie dynamic lane/speed switching is not supported, aspm feature can be still enabled. So, using "amdgpu_device_pcie_dynamic_switching_supported" for the determination whether aspm feature can be enabled seems not proper. Evan > -----Original Message----- > From: Limonciello, Mario <Mario.Limonciello@xxxxxxx> > Sent: Saturday, July 8, 2023 10:26 AM > To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx > Cc: Quan, Evan <Evan.Quan@xxxxxxx>; Limonciello, Mario > <Mario.Limonciello@xxxxxxx> > Subject: [PATCH 4/4] drm/amd: Drop amdgpu_device_aspm_support_quirk() > > NV and VI currently set up a quirk to not enable ASPM on Alder Lake > systems, but the issue appears to be tied to hosts without support > for dynamic speed switching. Migrate both of these over to use > amdgpu_device_pcie_dynamic_switching_supported() instead and drop > amdgpu_device_aspm_support_quirk(). > > Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 11 ----------- > drivers/gpu/drm/amd/amdgpu/nv.c | 5 ++++- > drivers/gpu/drm/amd/amdgpu/vi.c | 5 ++++- > 4 files changed, 8 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index 813713f42d5e..6ecf42c4c970 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -1315,7 +1315,6 @@ int amdgpu_device_pci_reset(struct > amdgpu_device *adev); > bool amdgpu_device_need_post(struct amdgpu_device *adev); > bool amdgpu_device_pcie_dynamic_switching_supported(void); > bool amdgpu_device_should_use_aspm(struct amdgpu_device *adev); > -bool amdgpu_device_aspm_support_quirk(void); > > void amdgpu_cs_report_moved_bytes(struct amdgpu_device *adev, u64 > num_bytes, > u64 num_vis_bytes); > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index 7314529553f6..a9e757f899f2 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -1505,17 +1505,6 @@ bool amdgpu_device_should_use_aspm(struct > amdgpu_device *adev) > return pcie_aspm_enabled(adev->pdev); > } > > -bool amdgpu_device_aspm_support_quirk(void) > -{ > -#if IS_ENABLED(CONFIG_X86) > - struct cpuinfo_x86 *c = &cpu_data(0); > - > - return !(c->x86 == 6 && c->x86_model == INTEL_FAM6_ALDERLAKE); > -#else > - return true; > -#endif > -} > - > /* if we get transitioned to only one device, take VGA back */ > /** > * amdgpu_device_vga_set_decode - enable/disable vga decode > diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c > b/drivers/gpu/drm/amd/amdgpu/nv.c > index 51523b27a186..71bc5b2f36cf 100644 > --- a/drivers/gpu/drm/amd/amdgpu/nv.c > +++ b/drivers/gpu/drm/amd/amdgpu/nv.c > @@ -527,7 +527,10 @@ static int nv_set_vce_clocks(struct amdgpu_device > *adev, u32 evclk, u32 ecclk) > > static void nv_program_aspm(struct amdgpu_device *adev) > { > - if (!amdgpu_device_should_use_aspm(adev) > || !amdgpu_device_aspm_support_quirk()) > + if (!amdgpu_device_should_use_aspm(adev)) > + return; > + > + if (!amdgpu_device_pcie_dynamic_switching_supported()) > return; > > if (!(adev->flags & AMD_IS_APU) && > diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c > b/drivers/gpu/drm/amd/amdgpu/vi.c > index 6a8494f98d3e..f44c78e69b7f 100644 > --- a/drivers/gpu/drm/amd/amdgpu/vi.c > +++ b/drivers/gpu/drm/amd/amdgpu/vi.c > @@ -1124,7 +1124,10 @@ 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)) > + return; > + > + if (!amdgpu_device_pcie_dynamic_switching_supported()) > return; > > if (adev->flags & AMD_IS_APU || > -- > 2.34.1