aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/rs690.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/rs690.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/rs690.c')
-rw-r--r--drivers/gpu/drm/radeon/rs690.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
index 4607025125c0..e7a5f87c23fe 100644
--- a/drivers/gpu/drm/radeon/rs690.c
+++ b/drivers/gpu/drm/radeon/rs690.c
@@ -661,7 +661,7 @@ void rs690_fini(struct radeon_device *rdev)
661 rs400_gart_fini(rdev); 661 rs400_gart_fini(rdev);
662 radeon_irq_kms_fini(rdev); 662 radeon_irq_kms_fini(rdev);
663 radeon_fence_driver_fini(rdev); 663 radeon_fence_driver_fini(rdev);
664 radeon_object_fini(rdev); 664 radeon_bo_fini(rdev);
665 radeon_atombios_fini(rdev); 665 radeon_atombios_fini(rdev);
666 kfree(rdev->bios); 666 kfree(rdev->bios);
667 rdev->bios = NULL; 667 rdev->bios = NULL;
@@ -721,7 +721,7 @@ int rs690_init(struct radeon_device *rdev)
721 if (r) 721 if (r)
722 return r; 722 return r;
723 /* Memory manager */ 723 /* Memory manager */
724 r = radeon_object_init(rdev); 724 r = radeon_bo_init(rdev);
725 if (r) 725 if (r)
726 return r; 726 return r;
727 r = rs400_gart_init(rdev); 727 r = rs400_gart_init(rdev);