diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/r300.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r300.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index 5eeb81061a21..561048a7c0a4 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include "drm.h" | 31 | #include "drm.h" |
32 | #include "radeon_reg.h" | 32 | #include "radeon_reg.h" |
33 | #include "radeon.h" | 33 | #include "radeon.h" |
34 | #include "radeon_asic.h" | ||
34 | #include "radeon_drm.h" | 35 | #include "radeon_drm.h" |
35 | #include "r100_track.h" | 36 | #include "r100_track.h" |
36 | #include "r300d.h" | 37 | #include "r300d.h" |
@@ -165,9 +166,9 @@ void rv370_pcie_gart_disable(struct radeon_device *rdev) | |||
165 | 166 | ||
166 | void rv370_pcie_gart_fini(struct radeon_device *rdev) | 167 | void rv370_pcie_gart_fini(struct radeon_device *rdev) |
167 | { | 168 | { |
169 | radeon_gart_fini(rdev); | ||
168 | rv370_pcie_gart_disable(rdev); | 170 | rv370_pcie_gart_disable(rdev); |
169 | radeon_gart_table_vram_free(rdev); | 171 | radeon_gart_table_vram_free(rdev); |
170 | radeon_gart_fini(rdev); | ||
171 | } | 172 | } |
172 | 173 | ||
173 | void r300_fence_ring_emit(struct radeon_device *rdev, | 174 | void r300_fence_ring_emit(struct radeon_device *rdev, |
@@ -482,6 +483,7 @@ void r300_mc_init(struct radeon_device *rdev) | |||
482 | radeon_vram_location(rdev, &rdev->mc, base); | 483 | radeon_vram_location(rdev, &rdev->mc, base); |
483 | if (!(rdev->flags & RADEON_IS_AGP)) | 484 | if (!(rdev->flags & RADEON_IS_AGP)) |
484 | radeon_gtt_location(rdev, &rdev->mc); | 485 | radeon_gtt_location(rdev, &rdev->mc); |
486 | radeon_update_bandwidth_info(rdev); | ||
485 | } | 487 | } |
486 | 488 | ||
487 | void rv370_set_pcie_lanes(struct radeon_device *rdev, int lanes) | 489 | void rv370_set_pcie_lanes(struct radeon_device *rdev, int lanes) |
@@ -1335,6 +1337,7 @@ int r300_suspend(struct radeon_device *rdev) | |||
1335 | 1337 | ||
1336 | void r300_fini(struct radeon_device *rdev) | 1338 | void r300_fini(struct radeon_device *rdev) |
1337 | { | 1339 | { |
1340 | radeon_pm_fini(rdev); | ||
1338 | r100_cp_fini(rdev); | 1341 | r100_cp_fini(rdev); |
1339 | r100_wb_fini(rdev); | 1342 | r100_wb_fini(rdev); |
1340 | r100_ib_fini(rdev); | 1343 | r100_ib_fini(rdev); |