aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/rv515.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/rv515.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/rv515.c')
-rw-r--r--drivers/gpu/drm/radeon/rv515.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
index 0ecf5d939aa..7793239e24b 100644
--- a/drivers/gpu/drm/radeon/rv515.c
+++ b/drivers/gpu/drm/radeon/rv515.c
@@ -539,11 +539,11 @@ void rv515_fini(struct radeon_device *rdev)
539 r100_wb_fini(rdev); 539 r100_wb_fini(rdev);
540 r100_ib_fini(rdev); 540 r100_ib_fini(rdev);
541 radeon_gem_fini(rdev); 541 radeon_gem_fini(rdev);
542 rv370_pcie_gart_fini(rdev); 542 rv370_pcie_gart_fini(rdev);
543 radeon_agp_fini(rdev); 543 radeon_agp_fini(rdev);
544 radeon_irq_kms_fini(rdev); 544 radeon_irq_kms_fini(rdev);
545 radeon_fence_driver_fini(rdev); 545 radeon_fence_driver_fini(rdev);
546 radeon_object_fini(rdev); 546 radeon_bo_fini(rdev);
547 radeon_atombios_fini(rdev); 547 radeon_atombios_fini(rdev);
548 kfree(rdev->bios); 548 kfree(rdev->bios);
549 rdev->bios = NULL; 549 rdev->bios = NULL;
@@ -600,7 +600,7 @@ int rv515_init(struct radeon_device *rdev)
600 if (r) 600 if (r)
601 return r; 601 return r;
602 /* Memory manager */ 602 /* Memory manager */
603 r = radeon_object_init(rdev); 603 r = radeon_bo_init(rdev);
604 if (r) 604 if (r)
605 return r; 605 return r;
606 r = rv370_pcie_gart_init(rdev); 606 r = rv370_pcie_gart_init(rdev);