Skip to contentSkip to conversation

Revert "drm/amd: Check if ASPM is enabled from PCIe subsystem"

PATCH In review Bert Karwatzki 3 participants 4 messages Feb 1 – Feb 3

Subsystems (2)
Stable branch Linux-next tree
lore
Share & tools
lore

Bert Karwatzki

author
#0 lore raw

PATCH 1/1 Revert "drm/amd: Check if ASPM is enabled from PCIe subsystem"

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]/ open here
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(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0 -3
index 7333e19291cf..ec9516d6ae97 100644
@@ -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;
Signature · 1 line
2.47.3
maintainer
#1 lore raw
Quoted 34 lines · Bert Karwatzki

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]/ open here
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(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0 -3
index 7333e19291cf..ec9516d6ae97 100644
@@ -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;
Signature · 1 line
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>

#2 lore raw
Quoted 39 lines · Greg KH
Quoted 34 lines · Bert Karwatzki

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]/ open here
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(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0 -3
index 7333e19291cf..ec9516d6ae97 100644
@@ -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;
Signature · 1 line
2.47.3

<formletter>

Quoted 6 lines

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>

FWIW I added a stable tag to the patch when applied to amd-staging-drm-next for this. So it should come back to stable once it merges in Linus' tree.

maintainer
#3 lore raw
Quoted 44 lines · Mario Limonciello
Quoted 43 lines · Greg KH
Quoted 33 lines · Bert Karwatzki

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]/ open here
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(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0 -3
index 7333e19291cf..ec9516d6ae97 100644
@@ -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;
Signature · 1 line
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.

Quoted 4 lines
Quoted 1 line

</formletter>

FWIW I added a stable tag to the patch when applied to amd-staging-drm-next for this. So it should come back to stable once it merges in Linus' tree.

Great, thanks!

greg k-h