aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r300.c
diff options
context:
space:
mode:
authorJerome Glisse <jglisse@redhat.com>2010-03-17 10:44:29 -0400
committerDave Airlie <airlied@redhat.com>2010-03-30 23:11:42 -0400
commitf9274562026558ab54a29331cf13e9ebec8cc890 (patch)
tree63088dab34efe13e0e23b769fa92d26e8600fe34 /drivers/gpu/drm/radeon/r300.c
parent97f23b3d85a4d734a8584dade3a34579931c8f8d (diff)
drm/radeon/kms: avoid possible oops (call gart_fini before gart_disable)
radeon_gart_fini might call GART unbind callback function which might try to access GART table but if gart_disable is call first the GART table will be unmapped so any access to it will oops. Signed-off-by: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r300.c')
-rw-r--r--drivers/gpu/drm/radeon/r300.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 63fe2750f3a..1023eeb6587 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -165,9 +165,9 @@ void rv370_pcie_gart_disable(struct radeon_device *rdev)
165 165
166void rv370_pcie_gart_fini(struct radeon_device *rdev) 166void rv370_pcie_gart_fini(struct radeon_device *rdev)
167{ 167{
168 radeon_gart_fini(rdev);
168 rv370_pcie_gart_disable(rdev); 169 rv370_pcie_gart_disable(rdev);
169 radeon_gart_table_vram_free(rdev); 170 radeon_gart_table_vram_free(rdev);
170 radeon_gart_fini(rdev);
171} 171}
172 172
173void r300_fence_ring_emit(struct radeon_device *rdev, 173void r300_fence_ring_emit(struct radeon_device *rdev,