26,6 → 26,7 |
* Jerome Glisse |
*/ |
#include <linux/seq_file.h> |
#include <linux/slab.h> |
#include "drmP.h" |
#include "radeon_drm.h" |
#include "radeon_reg.h" |
123,7 → 124,7 |
/* 64 dwords should be enough for fence too */ |
r = radeon_ring_lock(rdev, 64); |
if (r) { |
DRM_ERROR("radeon: scheduling IB failled (%d).\n", r); |
DRM_ERROR("radeon: scheduling IB failed (%d).\n", r); |
return r; |
} |
radeon_ring_ib_execute(rdev, ib); |
148,8 → 149,8 |
return 0; |
INIT_LIST_HEAD(&rdev->ib_pool.bogus_ib); |
/* Allocate 1M object buffer */ |
r = radeon_bo_create(rdev, NULL, RADEON_IB_POOL_SIZE*64*1024, |
true, RADEON_GEM_DOMAIN_GTT, |
r = radeon_bo_create(rdev, RADEON_IB_POOL_SIZE*64*1024, |
PAGE_SIZE, true, RADEON_GEM_DOMAIN_GTT, |
&rdev->ib_pool.robj); |
if (r) { |
DRM_ERROR("radeon: failed to ib pool (%d).\n", r); |
167,7 → 168,7 |
r = radeon_bo_kmap(rdev->ib_pool.robj, &ptr); |
radeon_bo_unreserve(rdev->ib_pool.robj); |
if (r) { |
DRM_ERROR("radeon: failed to map ib poll (%d).\n", r); |
DRM_ERROR("radeon: failed to map ib pool (%d).\n", r); |
return r; |
} |
for (i = 0; i < RADEON_IB_POOL_SIZE; i++) { |
192,22 → 193,26 |
void radeon_ib_pool_fini(struct radeon_device *rdev) |
{ |
int r; |
struct radeon_bo *robj; |
|
if (!rdev->ib_pool.ready) { |
return; |
} |
mutex_lock(&rdev->ib_pool.mutex); |
if (rdev->ib_pool.robj) { |
r = radeon_bo_reserve(rdev->ib_pool.robj, false); |
// radeon_ib_bogus_cleanup(rdev); |
robj = rdev->ib_pool.robj; |
rdev->ib_pool.robj = NULL; |
mutex_unlock(&rdev->ib_pool.mutex); |
|
if (robj) { |
r = radeon_bo_reserve(robj, false); |
if (likely(r == 0)) { |
radeon_bo_kunmap(rdev->ib_pool.robj); |
radeon_bo_unpin(rdev->ib_pool.robj); |
radeon_bo_unreserve(rdev->ib_pool.robj); |
radeon_bo_kunmap(robj); |
radeon_bo_unpin(robj); |
radeon_bo_unreserve(robj); |
} |
radeon_bo_unref(&rdev->ib_pool.robj); |
rdev->ib_pool.robj = NULL; |
radeon_bo_unref(&robj); |
} |
mutex_unlock(&rdev->ib_pool.mutex); |
} |
|
|
216,10 → 221,14 |
*/ |
void radeon_ring_free_size(struct radeon_device *rdev) |
{ |
if (rdev->wb.enabled) |
rdev->cp.rptr = le32_to_cpu(rdev->wb.wb[RADEON_WB_CP_RPTR_OFFSET/4]); |
else { |
if (rdev->family >= CHIP_R600) |
rdev->cp.rptr = RREG32(R600_CP_RB_RPTR); |
else |
rdev->cp.rptr = RREG32(RADEON_CP_RB_RPTR); |
} |
/* This works because ring_size is a power of 2 */ |
rdev->cp.ring_free_dw = (rdev->cp.rptr + (rdev->cp.ring_size / 4)); |
rdev->cp.ring_free_dw -= rdev->cp.wptr; |
229,7 → 238,7 |
} |
} |
|
int radeon_ring_lock(struct radeon_device *rdev, unsigned ndw) |
int radeon_ring_alloc(struct radeon_device *rdev, unsigned ndw) |
{ |
int r; |
|
236,7 → 245,6 |
/* Align requested size with padding so unlock_commit can |
* pad safely */ |
ndw = (ndw + rdev->cp.align_mask) & ~rdev->cp.align_mask; |
mutex_lock(&rdev->cp.mutex); |
while (ndw > (rdev->cp.ring_free_dw - 1)) { |
radeon_ring_free_size(rdev); |
if (ndw < rdev->cp.ring_free_dw) { |
253,8 → 261,21 |
return 0; |
} |
|
void radeon_ring_unlock_commit(struct radeon_device *rdev) |
int radeon_ring_lock(struct radeon_device *rdev, unsigned ndw) |
{ |
int r; |
|
mutex_lock(&rdev->cp.mutex); |
r = radeon_ring_alloc(rdev, ndw); |
if (r) { |
mutex_unlock(&rdev->cp.mutex); |
return r; |
} |
return 0; |
} |
|
void radeon_ring_commit(struct radeon_device *rdev) |
{ |
unsigned count_dw_pad; |
unsigned i; |
|
266,6 → 287,11 |
} |
DRM_MEMORYBARRIER(); |
radeon_cp_commit(rdev); |
} |
|
void radeon_ring_unlock_commit(struct radeon_device *rdev) |
{ |
radeon_ring_commit(rdev); |
mutex_unlock(&rdev->cp.mutex); |
} |
|
282,7 → 308,7 |
rdev->cp.ring_size = ring_size; |
/* Allocate ring buffer */ |
if (rdev->cp.ring_obj == NULL) { |
r = radeon_bo_create(rdev, NULL, rdev->cp.ring_size, true, |
r = radeon_bo_create(rdev, rdev->cp.ring_size, PAGE_SIZE, true, |
RADEON_GEM_DOMAIN_GTT, |
&rdev->cp.ring_obj); |
if (r) { |
315,21 → 341,24 |
void radeon_ring_fini(struct radeon_device *rdev) |
{ |
int r; |
struct radeon_bo *ring_obj; |
|
mutex_lock(&rdev->cp.mutex); |
if (rdev->cp.ring_obj) { |
r = radeon_bo_reserve(rdev->cp.ring_obj, false); |
if (likely(r == 0)) { |
radeon_bo_kunmap(rdev->cp.ring_obj); |
radeon_bo_unpin(rdev->cp.ring_obj); |
radeon_bo_unreserve(rdev->cp.ring_obj); |
} |
radeon_bo_unref(&rdev->cp.ring_obj); |
ring_obj = rdev->cp.ring_obj; |
rdev->cp.ring = NULL; |
rdev->cp.ring_obj = NULL; |
} |
mutex_unlock(&rdev->cp.mutex); |
|
if (ring_obj) { |
r = radeon_bo_reserve(ring_obj, false); |
if (likely(r == 0)) { |
radeon_bo_kunmap(ring_obj); |
radeon_bo_unpin(ring_obj); |
radeon_bo_unreserve(ring_obj); |
} |
radeon_bo_unref(&ring_obj); |
} |
} |
|
|
/* |
354,8 → 383,37 |
return 0; |
} |
|
static int radeon_debugfs_ib_bogus_info(struct seq_file *m, void *data) |
{ |
struct drm_info_node *node = (struct drm_info_node *) m->private; |
struct radeon_device *rdev = node->info_ent->data; |
struct radeon_ib *ib; |
unsigned i; |
|
mutex_lock(&rdev->ib_pool.mutex); |
if (list_empty(&rdev->ib_pool.bogus_ib)) { |
mutex_unlock(&rdev->ib_pool.mutex); |
seq_printf(m, "no bogus IB recorded\n"); |
return 0; |
} |
ib = list_first_entry(&rdev->ib_pool.bogus_ib, struct radeon_ib, list); |
list_del_init(&ib->list); |
mutex_unlock(&rdev->ib_pool.mutex); |
seq_printf(m, "IB size %05u dwords\n", ib->length_dw); |
for (i = 0; i < ib->length_dw; i++) { |
seq_printf(m, "[%05u]=0x%08X\n", i, ib->ptr[i]); |
} |
vfree(ib->ptr); |
kfree(ib); |
return 0; |
} |
|
static struct drm_info_list radeon_debugfs_ib_list[RADEON_IB_POOL_SIZE]; |
static char radeon_debugfs_ib_names[RADEON_IB_POOL_SIZE][32]; |
|
static struct drm_info_list radeon_debugfs_ib_bogus_info_list[] = { |
{"radeon_ib_bogus", radeon_debugfs_ib_bogus_info, 0, NULL}, |
}; |
#endif |
|
int radeon_debugfs_ib_init(struct radeon_device *rdev) |