fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

i965: Simplify some bo != batch->bo special cases.

Browse source 
Extracted from a patch by Chris Wilson.

Now that the batch is always at the front of the validation list,
we don't need to special case it - the usual "go find an existing BO"
code will work just fine.
This commit is contained in:
Kenneth Graunke 2017-08-02 23:58:07 -07:00
parent 29ba502a4e
commit 68d611ed8e
1 changed files with 20 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/mesa/drivers/dri/i965/intel_batchbuffer.c
View file

@ -97,21 +97,20 @@ intel_batchbuffer_init(struct intel_batchbuffer *batch,
static unsigned
add_exec_bo(struct intel_batchbuffer *batch, struct brw_bo *bo)
{
if (bo != batch->bo) {
unsigned index = READ_ONCE(bo->index);
unsigned index = READ_ONCE(bo->index);
if (index < batch->exec_count && batch->exec_bos[index] == bo)
if (index < batch->exec_count && batch->exec_bos[index] == bo)
return index;
/* May have been shared between multiple active batches */
for (index = 0; index < batch->exec_count; index++) {
if (batch->exec_bos[index] == bo)
return index;
/* May have been shared between multiple active batches */
for (index = 0; index < batch->exec_count; index++) {
if (batch->exec_bos[index] == bo)
return index;
}
brw_bo_reference(bo);
}
if (bo != batch->bo)
brw_bo_reference(bo);
if (batch->exec_count == batch->exec_array_size) {
batch->exec_array_size *= 2;
batch->exec_bos =
@ -807,25 +806,18 @@ brw_emit_reloc(struct intel_batchbuffer *batch, uint32_t batch_offset,
assert(batch_offset <= BATCH_SZ - sizeof(uint32_t));
assert(_mesa_bitcount(write_domain) <= 1);
uint64_t offset64;
if (target != batch->bo) {
unsigned int index = add_exec_bo(batch, target);
struct drm_i915_gem_exec_object2 *entry = &batch->validation_list[index];
unsigned int index = add_exec_bo(batch, target);
struct drm_i915_gem_exec_object2 *entry = &batch->validation_list[index];
if (write_domain) {
entry->flags |= EXEC_OBJECT_WRITE;
if (write_domain) {
entry->flags |= EXEC_OBJECT_WRITE;
/* PIPECONTROL needs a w/a on gen6 */
if (write_domain == I915_GEM_DOMAIN_INSTRUCTION) {
struct brw_context *brw = container_of(batch, brw, batch);
if (brw->gen == 6)
entry->flags |= EXEC_OBJECT_NEEDS_GTT;
}
if (write_domain == I915_GEM_DOMAIN_INSTRUCTION) {
struct brw_context *brw = container_of(batch, brw, batch);
if (brw->gen == 6)
entry->flags |= EXEC_OBJECT_NEEDS_GTT;
}
offset64 = entry->offset;
} else {
offset64 = target->offset64;
}
batch->relocs[batch->reloc_count++] =
@ -833,14 +825,14 @@ brw_emit_reloc(struct intel_batchbuffer *batch, uint32_t batch_offset,
.offset = batch_offset,
.delta = target_offset,
.target_handle = target->gem_handle,
.presumed_offset = offset64,
.presumed_offset = entry->offset,
};
/* Using the old buffer offset, write in what the right data would be, in
* case the buffer doesn't move and we can short-circuit the relocation
* processing in the kernel
*/
return offset64 + target_offset;
return entry->offset + target_offset;
}
void