diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2018-05-11 10:09:59 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2018-05-22 15:46:35 -0700 |
| commit | f566a1264c131b5883e5bb0e293a94ef1378c43e (patch) | |
| tree | c7a697f2a87702f0fd40e63e2d157ae9ed5d0730 | |
| parent | 33affda8bf6cbcff14d51f6d99635c8f41432cda (diff) | |
i965: Remove support for the BLT ring
We still support the blitter on gen4-5 but it's on the same ring as 3D.
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_batchbuffer.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c index fe1ea02ca41..4f78d8d0508 100644 --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c +++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c @@ -776,18 +776,12 @@ submit_batch(struct brw_context *brw, int in_fence_fd, int *out_fence_fd) * To avoid stalling, execobject.offset should match the current * address of that object within the active context. */ - int flags = I915_EXEC_NO_RELOC; + assert(devinfo->gen < 6 || batch->ring == RENDER_RING); + int flags = I915_EXEC_NO_RELOC | I915_EXEC_RENDER; - if (devinfo->gen >= 6 && batch->ring == BLT_RING) { - flags |= I915_EXEC_BLT; - } else { - flags |= I915_EXEC_RENDER; - } if (batch->needs_sol_reset) flags |= I915_EXEC_GEN7_SOL_RESET; - uint32_t hw_ctx = batch->ring == RENDER_RING ? brw->hw_ctx : 0; - /* Set statebuffer relocations */ const unsigned state_index = batch->state.bo->index; if (state_index < batch->exec_count && @@ -817,7 +811,7 @@ submit_batch(struct brw_context *brw, int in_fence_fd, int *out_fence_fd) batch->validation_list[index] = tmp; } - ret = execbuffer(dri_screen->fd, batch, hw_ctx, + ret = execbuffer(dri_screen->fd, batch, brw->hw_ctx, 4 * USED_BATCH(*batch), in_fence_fd, out_fence_fd, flags); |