Browse Source

i965: Drop a useless ret == 0 check.

Prior to the previous patch, we would pwrite the batchbuffer contents,
and wanted to skip the execbuffer if that failed.  Now that we memcpy,
we don't set ret != 0 on failure anymore, so it will always be 0.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
tags/17.3-branchpoint
Kenneth Graunke 8 years ago
parent
commit
3b812e62a1
1 changed files with 20 additions and 22 deletions
  1. 20
    22
      src/mesa/drivers/dri/i965/intel_batchbuffer.c

+ 20
- 22
src/mesa/drivers/dri/i965/intel_batchbuffer.c View File

@@ -662,31 +662,29 @@ do_flush_locked(struct brw_context *brw, int in_fence_fd, int *out_fence_fd)
if (batch->needs_sol_reset)
flags |= I915_EXEC_GEN7_SOL_RESET;

if (ret == 0) {
uint32_t hw_ctx = batch->ring == RENDER_RING ? brw->hw_ctx : 0;

struct drm_i915_gem_exec_object2 *entry = &batch->validation_list[0];
assert(entry->handle == batch->bo->gem_handle);
entry->relocation_count = batch->reloc_count;
entry->relocs_ptr = (uintptr_t) batch->relocs;

if (batch->use_batch_first) {
flags |= I915_EXEC_BATCH_FIRST | I915_EXEC_HANDLE_LUT;
} else {
/* Move the batch to the end of the validation list */
struct drm_i915_gem_exec_object2 tmp;
const unsigned index = batch->exec_count - 1;

tmp = *entry;
*entry = batch->validation_list[index];
batch->validation_list[index] = tmp;
}
uint32_t hw_ctx = batch->ring == RENDER_RING ? brw->hw_ctx : 0;

struct drm_i915_gem_exec_object2 *entry = &batch->validation_list[0];
assert(entry->handle == batch->bo->gem_handle);
entry->relocation_count = batch->reloc_count;
entry->relocs_ptr = (uintptr_t) batch->relocs;

ret = execbuffer(dri_screen->fd, batch, hw_ctx,
4 * USED_BATCH(*batch),
in_fence_fd, out_fence_fd, flags);
if (batch->use_batch_first) {
flags |= I915_EXEC_BATCH_FIRST | I915_EXEC_HANDLE_LUT;
} else {
/* Move the batch to the end of the validation list */
struct drm_i915_gem_exec_object2 tmp;
const unsigned index = batch->exec_count - 1;

tmp = *entry;
*entry = batch->validation_list[index];
batch->validation_list[index] = tmp;
}

ret = execbuffer(dri_screen->fd, batch, hw_ctx,
4 * USED_BATCH(*batch),
in_fence_fd, out_fence_fd, flags);

throttle(brw);
}


Loading…
Cancel
Save