From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C33F4E83EF7 for ; Wed, 4 Feb 2026 08:10:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6024710E4B5; Wed, 4 Feb 2026 08:10:22 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="hewQJ+Hc"; dkim-atps=neutral Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by gabe.freedesktop.org (Postfix) with ESMTPS id BC47B10E334 for ; Tue, 3 Feb 2026 14:39:45 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id D105660132; Tue, 3 Feb 2026 14:39:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F8C2C116D0; Tue, 3 Feb 2026 14:39:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1770129584; bh=Semr3uEiGiShmGO9CVwC5NBZLb/lp/IEe9ZwonDXKV4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=hewQJ+HcFEDt62zCsKCXEJGHf0fhtySxgM1IZBexQADTeQLHm3VZnnUnVSOQie7rY dSoCemA98AiLqJxrclFF366infkmIPJ4qLuwT688Ad/EFJYJU4IGY1amFCkNZeWicR dSrv4+FqotGTvK13kV46udZlNLyVUzfFj/ocWHyw= Date: Tue, 3 Feb 2026 15:39:41 +0100 From: Greg KH To: Bert Karwatzki Cc: linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, stable@vger.kernel.org, amd-gfx@lists.freedesktop.org, Alex Deucher , Mario Limonciello , Christian =?iso-8859-1?Q?K=F6nig?= Subject: Re: [PATCH 6.18.8] Revert "drm/amd: Check if ASPM is enabled from PCIe subsystem" Message-ID: <2026020334-vividly-cognitive-e0b6@gregkh> References: <20260201002508.1293510-1-spasswolf@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260201002508.1293510-1-spasswolf@web.de> X-Mailman-Approved-At: Wed, 04 Feb 2026 08:10:21 +0000 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" 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/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 > --- > 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 > > 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.