Commit 243b467d authored by Bert Karwatzki's avatar Bert Karwatzki Committed by Alex Deucher
Browse files

Revert "drm/amd: Check if ASPM is enabled from PCIe subsystem" 

This reverts commit 7294863a.

This commit was erroneously applied again after commit 0ab5d711
("drm/amd: Refactor `amdgpu_aspm` to be evaluated per device")
removed it, leading to very hard to debug crashes, when used with a system with two
AMD GPUs of which only one supports ASPM.

Link: https://lore.kernel.org/linux-acpi/20251006120944.7880-1-spasswolf@web.de/
Link: https://github.com/acpica/acpica/issues/1060


Fixes: 0ab5d711 ("drm/amd: Refactor `amdgpu_aspm` to be evaluated per device")
Signed-off-by: default avatarBert Karwatzki <spasswolf@web.de>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarMario Limonciello (AMD) <superm1@kernel.org>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 97a96893)
Cc: stable@vger.kernel.org
parent 1478a344

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+0 −3
Original line number Diff line number Diff line
@@ -2405,9 +2405,6 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, 
			return -ENODEV;

	}



	if (amdgpu_aspm == -1 && !pcie_aspm_enabled(pdev))

		amdgpu_aspm = 0;



	if (amdgpu_virtual_display ||

	    amdgpu_device_asic_has_dc_support(pdev, flags & AMD_ASIC_MASK))

		supports_atomic = true;