KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

winsys/radeon: rename nrelocs, crelocs to max_relocs, num_relocs 

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle 2016-09-09 18:53:22 +02:00
parent d66bbfbede
commit b8703e363c
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/gallium/winsys/radeon/drm/radeon_drm_cs.c
View File

@ -125,13 +125,13 @@ static void radeon_cs_context_cleanup(struct radeon_cs_context *csc)
{ {
unsigned i; unsigned i;
for (i = 0; i < csc->crelocs; i++) { for (i = 0; i < csc->num_relocs; i++) {
p_atomic_dec(&csc->relocs_bo[i].bo->num_cs_references); p_atomic_dec(&csc->relocs_bo[i].bo->num_cs_references);
radeon_bo_reference(&csc->relocs_bo[i].bo, NULL); radeon_bo_reference(&csc->relocs_bo[i].bo, NULL);
} }
csc->crelocs = 0; csc->num_relocs = 0;
csc->validated_crelocs = 0; csc->num_validated_relocs = 0;
csc->chunks[0].length_dw = 0; csc->chunks[0].length_dw = 0;
csc->chunks[1].length_dw = 0; csc->chunks[1].length_dw = 0;
@ -212,7 +212,7 @@ int radeon_lookup_buffer(struct radeon_cs_context *csc, struct radeon_bo *bo)
return i; return i;
/* Hash collision, look for the BO in the list of relocs linearly. */ /* Hash collision, look for the BO in the list of relocs linearly. */
for (i = csc->crelocs - 1; i >= 0; i--) { for (i = csc->num_relocs - 1; i >= 0; i--) {
if (csc->relocs_bo[i].bo == bo) { if (csc->relocs_bo[i].bo == bo) {
/* Put this reloc in the hash list. /* Put this reloc in the hash list.
* This will prevent additional hash collisions if there are * This will prevent additional hash collisions if there are
@ -270,36 +270,36 @@ static unsigned radeon_add_buffer(struct radeon_drm_cs *cs,
} }
/* New relocation, check if the backing array is large enough. */ /* New relocation, check if the backing array is large enough. */
if (csc->crelocs >= csc->nrelocs) { if (csc->num_relocs >= csc->max_relocs) {
uint32_t size; uint32_t size;
csc->nrelocs = MAX2(csc->nrelocs + 16, (unsigned)(csc->nrelocs * 1.3)); csc->max_relocs = MAX2(csc->max_relocs + 16, (unsigned)(csc->max_relocs * 1.3));
size = csc->nrelocs * sizeof(csc->relocs_bo[0]); size = csc->max_relocs * sizeof(csc->relocs_bo[0]);
csc->relocs_bo = realloc(csc->relocs_bo, size); csc->relocs_bo = realloc(csc->relocs_bo, size);
size = csc->nrelocs * sizeof(struct drm_radeon_cs_reloc); size = csc->max_relocs * sizeof(struct drm_radeon_cs_reloc);
csc->relocs = realloc(csc->relocs, size); csc->relocs = realloc(csc->relocs, size);
csc->chunks[1].chunk_data = (uint64_t)(uintptr_t)csc->relocs; csc->chunks[1].chunk_data = (uint64_t)(uintptr_t)csc->relocs;
} }
/* Initialize the new relocation. */ /* Initialize the new relocation. */
csc->relocs_bo[csc->crelocs].bo = NULL; csc->relocs_bo[csc->num_relocs].bo = NULL;
csc->relocs_bo[csc->crelocs].priority_usage = 1llu << priority; csc->relocs_bo[csc->num_relocs].priority_usage = 1llu << priority;
radeon_bo_reference(&csc->relocs_bo[csc->crelocs].bo, bo); radeon_bo_reference(&csc->relocs_bo[csc->num_relocs].bo, bo);
p_atomic_inc(&bo->num_cs_references); p_atomic_inc(&bo->num_cs_references);
reloc = &csc->relocs[csc->crelocs]; reloc = &csc->relocs[csc->num_relocs];
reloc->handle = bo->handle; reloc->handle = bo->handle;
reloc->read_domains = rd; reloc->read_domains = rd;
reloc->write_domain = wd; reloc->write_domain = wd;
reloc->flags = priority / 4; reloc->flags = priority / 4;
csc->reloc_indices_hashlist[hash] = csc->crelocs; csc->reloc_indices_hashlist[hash] = csc->num_relocs;
csc->chunks[1].length_dw += RELOC_DWORDS; csc->chunks[1].length_dw += RELOC_DWORDS;
*added_domains = rd | wd; *added_domains = rd | wd;
return csc->crelocs++; return csc->num_relocs++;
} }
static unsigned radeon_drm_cs_add_buffer(struct radeon_winsys_cs *rcs, static unsigned radeon_drm_cs_add_buffer(struct radeon_winsys_cs *rcs,
@ -338,21 +338,21 @@ static bool radeon_drm_cs_validate(struct radeon_winsys_cs *rcs)
cs->base.used_vram < cs->ws->info.vram_size * 0.8; cs->base.used_vram < cs->ws->info.vram_size * 0.8;
if (status) { if (status) {
cs->csc->validated_crelocs = cs->csc->crelocs; cs->csc->num_validated_relocs = cs->csc->num_relocs;
} else { } else {
/* Remove lately-added buffers. The validation failed with them /* Remove lately-added buffers. The validation failed with them
* and the CS is about to be flushed because of that. Keep only * and the CS is about to be flushed because of that. Keep only
* the already-validated buffers. */ * the already-validated buffers. */
unsigned i; unsigned i;
for (i = cs->csc->validated_crelocs; i < cs->csc->crelocs; i++) { for (i = cs->csc->num_validated_relocs; i < cs->csc->num_relocs; i++) {
p_atomic_dec(&cs->csc->relocs_bo[i].bo->num_cs_references); p_atomic_dec(&cs->csc->relocs_bo[i].bo->num_cs_references);
radeon_bo_reference(&cs->csc->relocs_bo[i].bo, NULL); radeon_bo_reference(&cs->csc->relocs_bo[i].bo, NULL);
} }
cs->csc->crelocs = cs->csc->validated_crelocs; cs->csc->num_relocs = cs->csc->num_validated_relocs;
/* Flush if there are any relocs. Clean up otherwise. */ /* Flush if there are any relocs. Clean up otherwise. */
if (cs->csc->crelocs) { if (cs->csc->num_relocs) {
cs->flush_cs(cs->flush_data, RADEON_FLUSH_ASYNC, NULL); cs->flush_cs(cs->flush_data, RADEON_FLUSH_ASYNC, NULL);
} else { } else {
radeon_cs_context_cleanup(cs->csc); radeon_cs_context_cleanup(cs->csc);
@ -381,13 +381,13 @@ static unsigned radeon_drm_cs_get_buffer_list(struct radeon_winsys_cs *rcs,
int i; int i;
if (list) { if (list) {
for (i = 0; i < cs->csc->crelocs; i++) { for (i = 0; i < cs->csc->num_relocs; i++) {
list[i].bo_size = cs->csc->relocs_bo[i].bo->base.size; list[i].bo_size = cs->csc->relocs_bo[i].bo->base.size;
list[i].vm_address = cs->csc->relocs_bo[i].bo->va; list[i].vm_address = cs->csc->relocs_bo[i].bo->va;
list[i].priority_usage = cs->csc->relocs_bo[i].priority_usage; list[i].priority_usage = cs->csc->relocs_bo[i].priority_usage;
} }
} }
return cs->csc->crelocs; return cs->csc->num_relocs;
} }
void radeon_drm_cs_emit_ioctl_oneshot(void *job, int thread_index) void radeon_drm_cs_emit_ioctl_oneshot(void *job, int thread_index)
@ -414,7 +414,7 @@ void radeon_drm_cs_emit_ioctl_oneshot(void *job, int thread_index)
} }
} }
for (i = 0; i < csc->crelocs; i++) for (i = 0; i < csc->num_relocs; i++)
p_atomic_dec(&csc->relocs_bo[i].bo->num_active_ioctls); p_atomic_dec(&csc->relocs_bo[i].bo->num_active_ioctls);
radeon_cs_context_cleanup(csc); radeon_cs_context_cleanup(csc);
@ -495,13 +495,13 @@ static int radeon_drm_cs_flush(struct radeon_winsys_cs *rcs,
/* If the CS is not empty or overflowed, emit it in a separate thread. */ /* If the CS is not empty or overflowed, emit it in a separate thread. */
if (cs->base.current.cdw && cs->base.current.cdw <= cs->base.current.max_dw && !debug_get_option_noop()) { if (cs->base.current.cdw && cs->base.current.cdw <= cs->base.current.max_dw && !debug_get_option_noop()) {
unsigned i, crelocs; unsigned i, num_relocs;
crelocs = cs->cst->crelocs; num_relocs = cs->cst->num_relocs;
cs->cst->chunks[0].length_dw = cs->base.current.cdw; cs->cst->chunks[0].length_dw = cs->base.current.cdw;
for (i = 0; i < crelocs; i++) { for (i = 0; i < num_relocs; i++) {
/* Update the number of active asynchronous CS ioctls for the buffer. */ /* Update the number of active asynchronous CS ioctls for the buffer. */
p_atomic_inc(&cs->cst->relocs_bo[i].bo->num_active_ioctls); p_atomic_inc(&cs->cst->relocs_bo[i].bo->num_active_ioctls);
} }

6
src/gallium/winsys/radeon/drm/radeon_drm_cs.h
View File

@ -44,9 +44,9 @@ struct radeon_cs_context {
uint32_t flags[2]; uint32_t flags[2];
/* Buffers. */ /* Buffers. */
unsigned nrelocs; unsigned max_relocs;
unsigned crelocs; unsigned num_relocs;
unsigned validated_crelocs; unsigned num_validated_relocs;
struct radeon_bo_item *relocs_bo; struct radeon_bo_item *relocs_bo;
struct drm_radeon_cs_reloc *relocs; struct drm_radeon_cs_reloc *relocs;