Merge tag 'hardening-v6.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

[linux.git] / drivers / gpu / drm / amd / amdgpu / vi.c

diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index fe8ba9e9837b39e82bc94cceb5a5a4e9a88b5ee4..1a98812981f42ca02b9641354bcd0776247ccc21 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -1124,11 +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_pcie_dynamic_switching_supported())
+       if (!amdgpu_device_should_use_aspm(adev))
                return;
 
-       if (adev->flags & AMD_IS_APU ||
-           adev->asic_type < CHIP_POLARIS10)
+       if (adev->asic_type < CHIP_POLARIS10)
                return;
 
        orig = data = RREG32_PCIE(ixPCIE_LC_CNTL);