Skip to content

Commit 243b467

Browse files
spasswolfalexdeucher
authored andcommitted
Revert "drm/amd: Check if ASPM is enabled from PCIe subsystem"
This reverts commit 7294863. This commit was erroneously applied again after commit 0ab5d71 ("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/[email protected]/ Link: acpica/acpica#1060 Fixes: 0ab5d71 ("drm/amd: Refactor `amdgpu_aspm` to be evaluated per device") Signed-off-by: Bert Karwatzki <[email protected]> Reviewed-by: Christian König <[email protected]> Reviewed-by: Mario Limonciello (AMD) <[email protected]> Signed-off-by: Mario Limonciello <[email protected]> Signed-off-by: Alex Deucher <[email protected]> (cherry picked from commit 97a9689) Cc: [email protected]
1 parent 1478a34 commit 243b467

1 file changed

Lines changed: 0 additions & 3 deletions

File tree

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2405,9 +2405,6 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
24052405
return -ENODEV;
24062406
}
24072407

2408-
if (amdgpu_aspm == -1 && !pcie_aspm_enabled(pdev))
2409-
amdgpu_aspm = 0;
2410-
24112408
if (amdgpu_virtual_display ||
24122409
amdgpu_device_asic_has_dc_support(pdev, flags & AMD_ASIC_MASK))
24132410
supports_atomic = true;

0 commit comments

Comments
 (0)