FAILED: patch "[PATCH] drm/amdgpu: check ASPM on the dGPU host link" failed to apply to 6.1-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.1-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 <[email protected]>.
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-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 2a9c5154a5650c09ad44ff5e1dff74754e15a3c6
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026082029-grading-pelvis-81de@gregkh' --subject-prefix 'PATCH 6.1.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 2a9c5154a5650c09ad44ff5e1dff74754e15a3c6 Mon Sep 17 00:00:00 2001
From: Yang Wang <[email protected]>
Date: Wed, 5 Aug 2026 20:39:18 +0800
Subject: [PATCH] drm/amdgpu: check ASPM on the dGPU host link
dGPUs with an internal PCIe switch expose graphics functions below the switch downstream port. The automatic ASPM check uses the display endpoint and evaluates the internal link instead of the host link.
Use the switch upstream port for the check and report the selected link.
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +49 -1
@@ -1370,6 +1370,31 @@ static bool amdgpu_device_aspm_support_quirk(struct amdgpu_device *adev)#endif } +/* +* Some dGPUs expose their display endpoint below an internal PCIe switch. +* Use the switch upstream port to query the host-facing link. +*/ +static struct pci_dev *amdgpu_device_get_aspm_pdev (struct amdgpu_device *adev) +{ +struct pci_dev *swds, *swus; + + swds =pci_upstream_bridge (adev->pdev); +if (!swds || + (swds->vendor !=PCI_VENDOR_ID_ATI && + swds->vendor !=PCI_VENDOR_ID_AMD ) || +pci_pcie_type (swds) !=PCI_EXP_TYPE_DOWNSTREAM ) +return adev->pdev; + + swus =pci_upstream_bridge (swds); +if (!swus || + (swus->vendor !=PCI_VENDOR_ID_ATI && + swus->vendor !=PCI_VENDOR_ID_AMD ) || +pci_pcie_type (swus) !=PCI_EXP_TYPE_UPSTREAM ) +return adev->pdev; + +return swus; +} +/** * amdgpu_device_should_use_aspm - check if the device should program ASPM *
@@ -1382,6 +1407,9 @@ static bool amdgpu_device_aspm_support_quirk(struct amdgpu_device *adev)*/ bool amdgpu_device_should_use_aspm (struct amdgpu_device *adev) { +struct pci_dev *aspm_pdev, *parent; +bool enabled; +switch (amdgpu_aspm) {case -1 :break ;
@@ -1396,7 +1424,27 @@ bool amdgpu_device_should_use_aspm(struct amdgpu_device *adev)return false;if (amdgpu_device_aspm_support_quirk (adev))return false; -return pcie_aspm_enabled (adev->pdev); + +/* +* pcie_aspm_enabled() checks the link between its argument and +* the immediate upstream bridge. Use SWUS for dGPUs with an +* internal switch so that this is the host-facing link. +*/ + aspm_pdev =amdgpu_device_get_aspm_pdev (adev); + parent =pci_upstream_bridge (aspm_pdev); +if (!parent) { +dev_dbg (adev->dev,"ASPM: no upstream PCIe link for %s\n" , +pci_name (aspm_pdev)); +return false; + } + + enabled =pcie_aspm_enabled (aspm_pdev); +/* Report the exact link used for the automatic ASPM decision. */ +dev_dbg (adev->dev,"ASPM: link %s <-> %s is %s\n" , +pci_name (parent),pci_name (aspm_pdev), + enabled ?"enabled" :"disabled" ); + +return enabled; }/* if we get transitioned to only one device, take VGA back */
Sasha Levin
maintainerPATCH 1/1 drm/amdgpu: check ASPM on the dGPU host link
From: Yang Wang <[email protected]>
[ Upstream commit 2a9c5154a5650c09ad44ff5e1dff74754e15a3c6 ]
dGPUs with an internal PCIe switch expose graphics functions below the switch downstream port. The automatic ASPM check uses the display endpoint and evaluates the internal link instead of the host link.
Use the switch upstream port for the check and report the selected link.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 50 +++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +49 -1
@@ -1375,6 +1375,31 @@ bool amdgpu_device_pcie_dynamic_switching_supported(void)return true; } +/* +* Some dGPUs expose their display endpoint below an internal PCIe switch. +* Use the switch upstream port to query the host-facing link. +*/ +static struct pci_dev *amdgpu_device_get_aspm_pdev (struct amdgpu_device *adev) +{ +struct pci_dev *swds, *swus; + + swds =pci_upstream_bridge (adev->pdev); +if (!swds || + (swds->vendor !=PCI_VENDOR_ID_ATI && + swds->vendor !=PCI_VENDOR_ID_AMD ) || +pci_pcie_type (swds) !=PCI_EXP_TYPE_DOWNSTREAM ) +return adev->pdev; + + swus =pci_upstream_bridge (swds); +if (!swus || + (swus->vendor !=PCI_VENDOR_ID_ATI && + swus->vendor !=PCI_VENDOR_ID_AMD ) || +pci_pcie_type (swus) !=PCI_EXP_TYPE_UPSTREAM ) +return adev->pdev; + +return swus; +} +/** * amdgpu_device_should_use_aspm - check if the device should program ASPM *
@@ -1387,6 +1412,9 @@ bool amdgpu_device_pcie_dynamic_switching_supported(void)*/ bool amdgpu_device_should_use_aspm (struct amdgpu_device *adev) { +struct pci_dev *aspm_pdev, *parent; +bool enabled; +switch (amdgpu_aspm) {case -1 :break ;
@@ -1397,7 +1425,27 @@ bool amdgpu_device_should_use_aspm(struct amdgpu_device *adev)default :return false; } -return pcie_aspm_enabled (adev->pdev); + +/* +* pcie_aspm_enabled() checks the link between its argument and +* the immediate upstream bridge. Use SWUS for dGPUs with an +* internal switch so that this is the host-facing link. +*/ + aspm_pdev =amdgpu_device_get_aspm_pdev (adev); + parent =pci_upstream_bridge (aspm_pdev); +if (!parent) { +dev_dbg (adev->dev,"ASPM: no upstream PCIe link for %s\n" , +pci_name (aspm_pdev)); +return false; + } + + enabled =pcie_aspm_enabled (aspm_pdev); +/* Report the exact link used for the automatic ASPM decision. */ +dev_dbg (adev->dev,"ASPM: link %s <-> %s is %s\n" , +pci_name (parent),pci_name (aspm_pdev), + enabled ?"enabled" :"disabled" ); + +return enabled; }bool amdgpu_device_aspm_support_quirk (void )
Signature · 1 line
2.53.0