diff options
author | Christian König <deathsimple@vodafone.de> | 2012-05-09 09:34:53 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-05-09 12:22:35 -0400 |
commit | 2e0d99103e7b62ad27dcbc8c92337687dd8294e6 (patch) | |
tree | 694b08c575a0dbc36c3ac6be116e876ccee64c4d /drivers/gpu/drm/radeon/radeon_ring.c | |
parent | e6661a96647447aee83db976e8aad3d3a5c30cbd (diff) |
drm/radeon: make sa bo a stand alone object
Allocating and freeing it seperately.
Signed-off-by: Christian König <deathsimple@vodafone.de>
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.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c index f49c9c069e6b..45adb37152e1 100644 --- a/drivers/gpu/drm/radeon/radeon_ring.c +++ b/drivers/gpu/drm/radeon/radeon_ring.c | |||
@@ -127,8 +127,8 @@ retry: | |||
127 | size, 256); | 127 | size, 256); |
128 | if (!r) { | 128 | if (!r) { |
129 | *ib = &rdev->ib_pool.ibs[idx]; | 129 | *ib = &rdev->ib_pool.ibs[idx]; |
130 | (*ib)->ptr = radeon_sa_bo_cpu_addr(&(*ib)->sa_bo); | 130 | (*ib)->ptr = radeon_sa_bo_cpu_addr((*ib)->sa_bo); |
131 | (*ib)->gpu_addr = radeon_sa_bo_gpu_addr(&(*ib)->sa_bo); | 131 | (*ib)->gpu_addr = radeon_sa_bo_gpu_addr((*ib)->sa_bo); |
132 | (*ib)->fence = fence; | 132 | (*ib)->fence = fence; |
133 | (*ib)->vm_id = 0; | 133 | (*ib)->vm_id = 0; |
134 | (*ib)->is_const_ib = false; | 134 | (*ib)->is_const_ib = false; |
@@ -227,7 +227,7 @@ int radeon_ib_pool_init(struct radeon_device *rdev) | |||
227 | rdev->ib_pool.ibs[i].fence = NULL; | 227 | rdev->ib_pool.ibs[i].fence = NULL; |
228 | rdev->ib_pool.ibs[i].idx = i; | 228 | rdev->ib_pool.ibs[i].idx = i; |
229 | rdev->ib_pool.ibs[i].length_dw = 0; | 229 | rdev->ib_pool.ibs[i].length_dw = 0; |
230 | INIT_LIST_HEAD(&rdev->ib_pool.ibs[i].sa_bo.list); | 230 | rdev->ib_pool.ibs[i].sa_bo = NULL; |
231 | } | 231 | } |
232 | rdev->ib_pool.head_id = 0; | 232 | rdev->ib_pool.head_id = 0; |
233 | rdev->ib_pool.ready = true; | 233 | rdev->ib_pool.ready = true; |