On Sun, Feb 01, 2026 at 01:25:06AM +0100, Bert Karwatzki wrote:
> This reverts commit 7294863a6f01248d72b61d38478978d638641bee.
>
> This commit was erroneously applied again after commit 0ab5d711ec74
> ("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: https://github.com/acpica/acpica/issues/1060
> Fixes: 0ab5d711ec74 ("drm/amd: Refactor `amdgpu_aspm` to be evaluated per
> device")
>
> Signed-off-by: Bert Karwatzki <[email protected]>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> index 7333e19291cf..ec9516d6ae97 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> @@ -2334,9 +2334,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;
> --
> 2.47.3
>
>
<formletter>
This is not the correct way to submit patches for inclusion in the
stable kernel tree. Please read:
https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.
</formletter>
