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