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 0FB1C3AA1A5; Tue, 3 Feb 2026 14:39:44 +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=1770129585; cv=none; b=RgIjN55SEUpYz8wD3FiMvMIqDWzQXVJUojNNXj/ZOL/gri3XtIecqQWjbXuTv14w9RSCFS5CSKzMa2DLPWHXxD5nCLUR3O3rEjh6JJItkPWJ+cjmN2xICJ5uwkO22d/4068w7VAHRpXN77F4TgYN8DwuyD0WUoo2RZB3laQI1mA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770129585; c=relaxed/simple; bh=Semr3uEiGiShmGO9CVwC5NBZLb/lp/IEe9ZwonDXKV4=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=M5kPwUvleCYcsbTIQQEtrKu441mOQW1tkqOX7YXCy8YrqnZNFDIbCWeg5n8vuRNPauvKuOv2nyv3TTaiWwGBq2tE+o8pn7ysJpw/N2DgJSboAGd2eQFkXrceQ4rk0gGURzJlBYIDmNiKTLy86oNwSHIY02+OnzXcehhuPCy0Mlg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hewQJ+Hc; 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="hewQJ+Hc" 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260201002508.1293510-1-spasswolf@web.de> 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.