diff options
-rw-r--r-- | drivers/gpu/drm/radeon/cik.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/ni.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/rv770.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/si.c | 3 |
6 files changed, 12 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index 524db70aaf6e..5b587876c7f5 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c | |||
@@ -5954,6 +5954,8 @@ static int cik_startup(struct radeon_device *rdev) | |||
5954 | struct radeon_ring *ring; | 5954 | struct radeon_ring *ring; |
5955 | int r; | 5955 | int r; |
5956 | 5956 | ||
5957 | cik_mc_program(rdev); | ||
5958 | |||
5957 | if (rdev->flags & RADEON_IS_IGP) { | 5959 | if (rdev->flags & RADEON_IS_IGP) { |
5958 | if (!rdev->me_fw || !rdev->pfp_fw || !rdev->ce_fw || | 5960 | if (!rdev->me_fw || !rdev->pfp_fw || !rdev->ce_fw || |
5959 | !rdev->mec_fw || !rdev->sdma_fw || !rdev->rlc_fw) { | 5961 | !rdev->mec_fw || !rdev->sdma_fw || !rdev->rlc_fw) { |
@@ -5985,7 +5987,6 @@ static int cik_startup(struct radeon_device *rdev) | |||
5985 | if (r) | 5987 | if (r) |
5986 | return r; | 5988 | return r; |
5987 | 5989 | ||
5988 | cik_mc_program(rdev); | ||
5989 | r = cik_pcie_gart_enable(rdev); | 5990 | r = cik_pcie_gart_enable(rdev); |
5990 | if (r) | 5991 | if (r) |
5991 | return r; | 5992 | return r; |
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 5b98e573d60a..d5b49e33315e 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c | |||
@@ -5106,6 +5106,8 @@ static int evergreen_startup(struct radeon_device *rdev) | |||
5106 | /* enable aspm */ | 5106 | /* enable aspm */ |
5107 | evergreen_program_aspm(rdev); | 5107 | evergreen_program_aspm(rdev); |
5108 | 5108 | ||
5109 | evergreen_mc_program(rdev); | ||
5110 | |||
5109 | if (ASIC_IS_DCE5(rdev)) { | 5111 | if (ASIC_IS_DCE5(rdev)) { |
5110 | if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw || !rdev->mc_fw) { | 5112 | if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw || !rdev->mc_fw) { |
5111 | r = ni_init_microcode(rdev); | 5113 | r = ni_init_microcode(rdev); |
@@ -5133,7 +5135,6 @@ static int evergreen_startup(struct radeon_device *rdev) | |||
5133 | if (r) | 5135 | if (r) |
5134 | return r; | 5136 | return r; |
5135 | 5137 | ||
5136 | evergreen_mc_program(rdev); | ||
5137 | if (rdev->flags & RADEON_IS_AGP) { | 5138 | if (rdev->flags & RADEON_IS_AGP) { |
5138 | evergreen_agp_enable(rdev); | 5139 | evergreen_agp_enable(rdev); |
5139 | } else { | 5140 | } else { |
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 16e91b08bf57..12cebe46e34f 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c | |||
@@ -2079,6 +2079,8 @@ static int cayman_startup(struct radeon_device *rdev) | |||
2079 | /* enable aspm */ | 2079 | /* enable aspm */ |
2080 | evergreen_program_aspm(rdev); | 2080 | evergreen_program_aspm(rdev); |
2081 | 2081 | ||
2082 | evergreen_mc_program(rdev); | ||
2083 | |||
2082 | if (rdev->flags & RADEON_IS_IGP) { | 2084 | if (rdev->flags & RADEON_IS_IGP) { |
2083 | if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) { | 2085 | if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) { |
2084 | r = ni_init_microcode(rdev); | 2086 | r = ni_init_microcode(rdev); |
@@ -2107,7 +2109,6 @@ static int cayman_startup(struct radeon_device *rdev) | |||
2107 | if (r) | 2109 | if (r) |
2108 | return r; | 2110 | return r; |
2109 | 2111 | ||
2110 | evergreen_mc_program(rdev); | ||
2111 | r = cayman_pcie_gart_enable(rdev); | 2112 | r = cayman_pcie_gart_enable(rdev); |
2112 | if (r) | 2113 | if (r) |
2113 | return r; | 2114 | return r; |
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 0a9553abec54..af848045670c 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
@@ -3330,6 +3330,8 @@ static int r600_startup(struct radeon_device *rdev) | |||
3330 | /* enable pcie gen2 link */ | 3330 | /* enable pcie gen2 link */ |
3331 | r600_pcie_gen2_enable(rdev); | 3331 | r600_pcie_gen2_enable(rdev); |
3332 | 3332 | ||
3333 | r600_mc_program(rdev); | ||
3334 | |||
3333 | if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) { | 3335 | if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) { |
3334 | r = r600_init_microcode(rdev); | 3336 | r = r600_init_microcode(rdev); |
3335 | if (r) { | 3337 | if (r) { |
@@ -3342,7 +3344,6 @@ static int r600_startup(struct radeon_device *rdev) | |||
3342 | if (r) | 3344 | if (r) |
3343 | return r; | 3345 | return r; |
3344 | 3346 | ||
3345 | r600_mc_program(rdev); | ||
3346 | if (rdev->flags & RADEON_IS_AGP) { | 3347 | if (rdev->flags & RADEON_IS_AGP) { |
3347 | r600_agp_enable(rdev); | 3348 | r600_agp_enable(rdev); |
3348 | } else { | 3349 | } else { |
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index f1010131bac0..3cc08a4d99d9 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c | |||
@@ -1829,6 +1829,8 @@ static int rv770_startup(struct radeon_device *rdev) | |||
1829 | /* enable pcie gen2 link */ | 1829 | /* enable pcie gen2 link */ |
1830 | rv770_pcie_gen2_enable(rdev); | 1830 | rv770_pcie_gen2_enable(rdev); |
1831 | 1831 | ||
1832 | rv770_mc_program(rdev); | ||
1833 | |||
1832 | if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) { | 1834 | if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) { |
1833 | r = r600_init_microcode(rdev); | 1835 | r = r600_init_microcode(rdev); |
1834 | if (r) { | 1836 | if (r) { |
@@ -1841,7 +1843,6 @@ static int rv770_startup(struct radeon_device *rdev) | |||
1841 | if (r) | 1843 | if (r) |
1842 | return r; | 1844 | return r; |
1843 | 1845 | ||
1844 | rv770_mc_program(rdev); | ||
1845 | if (rdev->flags & RADEON_IS_AGP) { | 1846 | if (rdev->flags & RADEON_IS_AGP) { |
1846 | rv770_agp_enable(rdev); | 1847 | rv770_agp_enable(rdev); |
1847 | } else { | 1848 | } else { |
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index 242c1ac83e23..6a2dca4acfc1 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c | |||
@@ -6418,6 +6418,8 @@ static int si_startup(struct radeon_device *rdev) | |||
6418 | /* enable aspm */ | 6418 | /* enable aspm */ |
6419 | si_program_aspm(rdev); | 6419 | si_program_aspm(rdev); |
6420 | 6420 | ||
6421 | si_mc_program(rdev); | ||
6422 | |||
6421 | if (!rdev->me_fw || !rdev->pfp_fw || !rdev->ce_fw || | 6423 | if (!rdev->me_fw || !rdev->pfp_fw || !rdev->ce_fw || |
6422 | !rdev->rlc_fw || !rdev->mc_fw) { | 6424 | !rdev->rlc_fw || !rdev->mc_fw) { |
6423 | r = si_init_microcode(rdev); | 6425 | r = si_init_microcode(rdev); |
@@ -6437,7 +6439,6 @@ static int si_startup(struct radeon_device *rdev) | |||
6437 | if (r) | 6439 | if (r) |
6438 | return r; | 6440 | return r; |
6439 | 6441 | ||
6440 | si_mc_program(rdev); | ||
6441 | r = si_pcie_gart_enable(rdev); | 6442 | r = si_pcie_gart_enable(rdev); |
6442 | if (r) | 6443 | if (r) |
6443 | return r; | 6444 | return r; |