From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 10BA027F4E7 for ; Sat, 7 Feb 2026 14:43:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770475414; cv=none; b=Pu+U9KhJtKSI2JhP/lT6/bbAJ7P/oYXMWe4lvSldS6aFbhYL0GVS3lMDc6E2+FLfYBRtxYQVxw7P2wNcqAeWPsZHJ41eG+EmolsQkhP56EB4yO7AqdkD71m0UAzE0hOHaPLQxz52gDe4UEjlAHyigl3gyJfU5Of28ELXm4yQsgQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770475414; c=relaxed/simple; bh=IP/M6jhmN+lM9x7uZvayzZYi3TjDIqpkagyB/V+C6OU=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=X9vHyv5ACwCvZHnoCkpXCdc2BXsY4f0Pss21t8wLr+TGCbzhfmLx5n1iYghcpxZwdBuJfQ+DmFL0gULzhXD23jgYRJevcmoh6zcJZ9lv7d8Yq1vVI7um2JVC+/+dbY98pO1x2UWZSEM+kNAHE7qsr3frl+BLCzTjmxjiuGme8jk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CqbqamVa; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="CqbqamVa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D98BC116D0; Sat, 7 Feb 2026 14:43:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1770475413; bh=IP/M6jhmN+lM9x7uZvayzZYi3TjDIqpkagyB/V+C6OU=; h=Subject:To:Cc:From:Date:From; b=CqbqamVaG76OWZqAZAIdGI/VNq6bgXAidAYHZhM+fM/VNPXyDANaI4tr1f3/1cKMD 6R958p1ll+VQBHKo451PU2zmBEDl+NQmj2RG5Bl3onMfOmzcygCTBiWR3GAra4pTTb ycPDpO0diUNtQ+LFJrdiy2FzrRZ5j7F/ZbsjBq+Q= Subject: FAILED: patch "[PATCH] Revert "drm/amd: Check if ASPM is enabled from PCIe" failed to apply to 5.15-stable tree To: spasswolf@web.de,alexander.deucher@amd.com,christian.koenig@amd.com,mario.limonciello@amd.com,superm1@kernel.org Cc: From: Date: Sat, 07 Feb 2026 15:43:30 +0100 Message-ID: <2026020730-glass-agreeable-5c2d@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 243b467dea1735fed904c2e54d248a46fa417a2d # git commit -s git send-email --to '' --in-reply-to '2026020730-glass-agreeable-5c2d@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 243b467dea1735fed904c2e54d248a46fa417a2d Mon Sep 17 00:00:00 2001 From: Bert Karwatzki Date: Sun, 1 Feb 2026 01:24:45 +0100 Subject: [PATCH] Revert "drm/amd: Check if ASPM is enabled from PCIe subsystem" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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/20251006120944.7880-1-spasswolf@web.de/ 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 Reviewed-by: Christian König Reviewed-by: Mario Limonciello (AMD) Signed-off-by: Mario Limonciello Signed-off-by: Alex Deucher (cherry picked from commit 97a9689300eb2b393ba5efc17c8e5db835917080) Cc: stable@vger.kernel.org diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 6ccb80e2d7c9..39387da8586b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -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;