summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_ring.c
diff options
context:
space:
mode:
authorJerome Glisse <jglisse@redhat.com>2009-09-11 15:35:22 +0200
committerDave Airlie <airlied@redhat.com>2009-09-14 16:09:59 +1000
commit9f022ddfb23793b475ff7e57ac08a766dd5d31bd (patch)
treeb90a004e7eaf6f79f52ac112abbe44abec141613 /drivers/gpu/drm/radeon/radeon_ring.c
parentd42571efe33552cd519b7f3800a788b5f2d51798 (diff)
downloadtalos-obmc-linux-9f022ddfb23793b475ff7e57ac08a766dd5d31bd.tar.gz
talos-obmc-linux-9f022ddfb23793b475ff7e57ac08a766dd5d31bd.zip
drm/radeon/kms: convert r4xx to new init path
This convert r4xx to new init path it also fix few bugs. Signed-off-by: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_ring.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_ring.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index aa9837a6aa75..168a555d6fba 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -151,6 +151,8 @@ int radeon_ib_pool_init(struct radeon_device *rdev)
int i;
int r = 0;
+ if (rdev->ib_pool.robj)
+ return 0;
/* Allocate 1M object buffer */
INIT_LIST_HEAD(&rdev->ib_pool.scheduled_ibs);
r = radeon_object_create(rdev, NULL, RADEON_IB_POOL_SIZE*64*1024,
OpenPOWER on IntegriCloud