drm/amdgpu: Adjust logic in amdgpu_device_partner_bandwidth()

Use current speed/width on devices which don't support
dynamic PCIe switching.

Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3289
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index bf1a6593dc5e907ccb097841cdae4dc947233e1c..f5168b4c3b03c331a66c12b51785c2ce414aae0e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -5948,13 +5948,18 @@ static void amdgpu_device_partner_bandwidth(struct amdgpu_device *adev,
        *speed = PCI_SPEED_UNKNOWN;
        *width = PCIE_LNK_WIDTH_UNKNOWN;
 
-       while ((parent = pci_upstream_bridge(parent))) {
-               /* skip upstream/downstream switches internal to dGPU*/
-               if (parent->vendor == PCI_VENDOR_ID_ATI)
-                       continue;
-               *speed = pcie_get_speed_cap(parent);
-               *width = pcie_get_width_cap(parent);
-               break;
+       if (amdgpu_device_pcie_dynamic_switching_supported(adev)) {
+               while ((parent = pci_upstream_bridge(parent))) {
+                       /* skip upstream/downstream switches internal to dGPU*/
+                       if (parent->vendor == PCI_VENDOR_ID_ATI)
+                               continue;
+                       *speed = pcie_get_speed_cap(parent);
+                       *width = pcie_get_width_cap(parent);
+                       break;
+               }
+       } else {
+               /* use the current speeds rather than max if switching is not supported */
+               pcie_bandwidth_available(adev->pdev, NULL, speed, width);
        }
 }