aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/ni.c
diff options
context:
space:
mode:
authorIlija Hadzic <ihadzic@research.bell-labs.com>2011-09-20 10:22:58 -0400
committerDave Airlie <airlied@redhat.com>2011-10-12 09:44:00 -0400
commitb07759bf41d52aaecd5de92c7d725d6834b23349 (patch)
treec66e43d4f656cb7438f516e6f7438dc531aa74ff /drivers/gpu/drm/radeon/ni.c
parentcd54033ae9dabad389c09e0f338e9d8c1465827f (diff)
drm/radeon: allow pcie gen2 speed on Cayman
Looks like the same pcie gen2 speed initialization for Evergreen also works on Cayman and seems to come up fine, so enable it if the module parameter says so Signed-off-by: Ilija Hadzic <ihadzic@research.bell-labs.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/ni.c')
-rw-r--r--drivers/gpu/drm/radeon/ni.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index bf4fce7c43f2..b6c8a4880a86 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -40,6 +40,7 @@ extern void evergreen_mc_program(struct radeon_device *rdev);
40extern void evergreen_irq_suspend(struct radeon_device *rdev); 40extern void evergreen_irq_suspend(struct radeon_device *rdev);
41extern int evergreen_mc_init(struct radeon_device *rdev); 41extern int evergreen_mc_init(struct radeon_device *rdev);
42extern void evergreen_fix_pci_max_read_req_size(struct radeon_device *rdev); 42extern void evergreen_fix_pci_max_read_req_size(struct radeon_device *rdev);
43extern void evergreen_pcie_gen2_enable(struct radeon_device *rdev);
43 44
44#define EVERGREEN_PFP_UCODE_SIZE 1120 45#define EVERGREEN_PFP_UCODE_SIZE 1120
45#define EVERGREEN_PM4_UCODE_SIZE 1376 46#define EVERGREEN_PM4_UCODE_SIZE 1376
@@ -1376,6 +1377,9 @@ static int cayman_startup(struct radeon_device *rdev)
1376{ 1377{
1377 int r; 1378 int r;
1378 1379
1380 /* enable pcie gen2 link */
1381 evergreen_pcie_gen2_enable(rdev);
1382
1379 if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw || !rdev->mc_fw) { 1383 if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw || !rdev->mc_fw) {
1380 r = ni_init_microcode(rdev); 1384 r = ni_init_microcode(rdev);
1381 if (r) { 1385 if (r) {