aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r420.c
diff options
context:
space:
mode:
authorJerome Glisse <jglisse@redhat.com>2009-11-20 08:29:23 -0500
committerDave Airlie <airlied@redhat.com>2009-12-01 23:00:18 -0500
commit4c7886791264f03428d5424befb1b96f08fc90f4 (patch)
tree2c644931001b06969fb3038e7beb68db436c4872 /drivers/gpu/drm/radeon/r420.c
parent1614f8b17b8cc3ad143541d41569623d30dbc9ec (diff)
drm/radeon/kms: Rework radeon object handling
The locking & protection of radeon object was somewhat messy. This patch completely rework it to now use ttm reserve as a protection for the radeon object structure member. It also shrink down the various radeon object structure by removing field which were redondant with the ttm information. Last it converts few simple functions to inline which should with performances. airlied: rebase on top of r600 and other changes. Signed-off-by: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r420.c')
-rw-r--r--drivers/gpu/drm/radeon/r420.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c
index 885610f8dd85..d72f0439b2fa 100644
--- a/drivers/gpu/drm/radeon/r420.c
+++ b/drivers/gpu/drm/radeon/r420.c
@@ -257,7 +257,7 @@ void r420_fini(struct radeon_device *rdev)
257 radeon_agp_fini(rdev); 257 radeon_agp_fini(rdev);
258 radeon_irq_kms_fini(rdev); 258 radeon_irq_kms_fini(rdev);
259 radeon_fence_driver_fini(rdev); 259 radeon_fence_driver_fini(rdev);
260 radeon_object_fini(rdev); 260 radeon_bo_fini(rdev);
261 if (rdev->is_atom_bios) { 261 if (rdev->is_atom_bios) {
262 radeon_atombios_fini(rdev); 262 radeon_atombios_fini(rdev);
263 } else { 263 } else {
@@ -325,7 +325,7 @@ int r420_init(struct radeon_device *rdev)
325 return r; 325 return r;
326 } 326 }
327 /* Memory manager */ 327 /* Memory manager */
328 r = radeon_object_init(rdev); 328 r = radeon_bo_init(rdev);
329 if (r) { 329 if (r) {
330 return r; 330 return r;
331 } 331 }