Commit 7e0e4196 authored by Kleber Sacilotto de Souza's avatar Kleber Sacilotto de Souza Committed by Alex Deucher

radeon: use max_bus_speed to activate gen2 speeds

radeon currently uses a drm function to get the speed capabilities for
the bus, drm_pcie_get_speed_cap_mask. However, this is a non-standard
method of performing this detection and this patch changes it to use
the max_bus_speed attribute.

From: Lucas Kannebley Tavares <lucaskt@linux.vnet.ibm.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <klebers@linux.vnet.ibm.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 50a583f6
...@@ -4999,8 +4999,7 @@ void evergreen_fini(struct radeon_device *rdev) ...@@ -4999,8 +4999,7 @@ void evergreen_fini(struct radeon_device *rdev)
void evergreen_pcie_gen2_enable(struct radeon_device *rdev) void evergreen_pcie_gen2_enable(struct radeon_device *rdev)
{ {
u32 link_width_cntl, speed_cntl, mask; u32 link_width_cntl, speed_cntl;
int ret;
if (radeon_pcie_gen2 == 0) if (radeon_pcie_gen2 == 0)
return; return;
...@@ -5015,11 +5014,8 @@ void evergreen_pcie_gen2_enable(struct radeon_device *rdev) ...@@ -5015,11 +5014,8 @@ void evergreen_pcie_gen2_enable(struct radeon_device *rdev)
if (ASIC_IS_X2(rdev)) if (ASIC_IS_X2(rdev))
return; return;
ret = drm_pcie_get_speed_cap_mask(rdev->ddev, &mask); if ((rdev->pdev->bus->max_bus_speed != PCIE_SPEED_5_0GT) &&
if (ret != 0) (rdev->pdev->bus->max_bus_speed != PCIE_SPEED_8_0GT))
return;
if (!(mask & DRM_PCIE_SPEED_50))
return; return;
speed_cntl = RREG32_PCIE_PORT(PCIE_LC_SPEED_CNTL); speed_cntl = RREG32_PCIE_PORT(PCIE_LC_SPEED_CNTL);
......
...@@ -4631,8 +4631,6 @@ static void r600_pcie_gen2_enable(struct radeon_device *rdev) ...@@ -4631,8 +4631,6 @@ static void r600_pcie_gen2_enable(struct radeon_device *rdev)
{ {
u32 link_width_cntl, lanes, speed_cntl, training_cntl, tmp; u32 link_width_cntl, lanes, speed_cntl, training_cntl, tmp;
u16 link_cntl2; u16 link_cntl2;
u32 mask;
int ret;
if (radeon_pcie_gen2 == 0) if (radeon_pcie_gen2 == 0)
return; return;
...@@ -4651,11 +4649,8 @@ static void r600_pcie_gen2_enable(struct radeon_device *rdev) ...@@ -4651,11 +4649,8 @@ static void r600_pcie_gen2_enable(struct radeon_device *rdev)
if (rdev->family <= CHIP_R600) if (rdev->family <= CHIP_R600)
return; return;
ret = drm_pcie_get_speed_cap_mask(rdev->ddev, &mask); if ((rdev->pdev->bus->max_bus_speed != PCIE_SPEED_5_0GT) &&
if (ret != 0) (rdev->pdev->bus->max_bus_speed != PCIE_SPEED_8_0GT))
return;
if (!(mask & DRM_PCIE_SPEED_50))
return; return;
speed_cntl = RREG32_PCIE_PORT(PCIE_LC_SPEED_CNTL); speed_cntl = RREG32_PCIE_PORT(PCIE_LC_SPEED_CNTL);
......
...@@ -2111,8 +2111,6 @@ static void rv770_pcie_gen2_enable(struct radeon_device *rdev) ...@@ -2111,8 +2111,6 @@ static void rv770_pcie_gen2_enable(struct radeon_device *rdev)
{ {
u32 link_width_cntl, lanes, speed_cntl, tmp; u32 link_width_cntl, lanes, speed_cntl, tmp;
u16 link_cntl2; u16 link_cntl2;
u32 mask;
int ret;
if (radeon_pcie_gen2 == 0) if (radeon_pcie_gen2 == 0)
return; return;
...@@ -2127,11 +2125,8 @@ static void rv770_pcie_gen2_enable(struct radeon_device *rdev) ...@@ -2127,11 +2125,8 @@ static void rv770_pcie_gen2_enable(struct radeon_device *rdev)
if (ASIC_IS_X2(rdev)) if (ASIC_IS_X2(rdev))
return; return;
ret = drm_pcie_get_speed_cap_mask(rdev->ddev, &mask); if ((rdev->pdev->bus->max_bus_speed != PCIE_SPEED_5_0GT) &&
if (ret != 0) (rdev->pdev->bus->max_bus_speed != PCIE_SPEED_8_0GT))
return;
if (!(mask & DRM_PCIE_SPEED_50))
return; return;
DRM_INFO("enabling PCIE gen 2 link speeds, disable with radeon.pcie_gen2=0\n"); DRM_INFO("enabling PCIE gen 2 link speeds, disable with radeon.pcie_gen2=0\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment