diff options
| -rw-r--r-- | src/gallium/drivers/iris/iris_batch.c | 12 | ||||
| -rw-r--r-- | src/gallium/drivers/iris/iris_batch.h | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/iris/iris_state.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c index bae1720601e..94c66409e1a 100644 --- a/src/gallium/drivers/iris/iris_batch.c +++ b/src/gallium/drivers/iris/iris_batch.c @@ -144,16 +144,16 @@ iris_init_batch(struct iris_batch *batch, struct iris_screen *screen, struct iris_vtable *vtbl, struct pipe_debug_callback *dbg, - uint8_t ring) + uint8_t engine) { batch->screen = screen; batch->vtbl = vtbl; batch->dbg = dbg; - /* ring should be one of I915_EXEC_RENDER, I915_EXEC_BLT, etc. */ - assert((ring & ~I915_EXEC_RING_MASK) == 0); - assert(util_bitcount(ring) == 1); - batch->ring = ring; + /* engine should be one of I915_EXEC_RENDER, I915_EXEC_BLT, etc. */ + assert((engine & ~I915_EXEC_RING_MASK) == 0); + assert(util_bitcount(engine) == 1); + batch->engine = engine; batch->exec_count = 0; batch->exec_array_size = 100; @@ -419,7 +419,7 @@ submit_batch(struct iris_batch *batch, int in_fence_fd, int *out_fence_fd) .buffer_count = batch->exec_count, .batch_start_offset = 0, .batch_len = batch->primary_batch_size, - .flags = batch->ring | + .flags = batch->engine | I915_EXEC_NO_RELOC | I915_EXEC_BATCH_FIRST | I915_EXEC_HANDLE_LUT, diff --git a/src/gallium/drivers/iris/iris_batch.h b/src/gallium/drivers/iris/iris_batch.h index 950022b63be..795a6981ec6 100644 --- a/src/gallium/drivers/iris/iris_batch.h +++ b/src/gallium/drivers/iris/iris_batch.h @@ -56,8 +56,8 @@ struct iris_batch { uint32_t hw_ctx_id; - /** Which ring this batch targets - a I915_EXEC_RING_MASK value */ - uint8_t ring; + /** Which engine this batch targets - a I915_EXEC_RING_MASK value */ + uint8_t engine; /** The validation list */ struct drm_i915_gem_exec_object2 *validation_list; diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index 434626d2725..d67c9bd84b2 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -3831,7 +3831,7 @@ get_post_sync_flags(enum pipe_control_flags flags) } // XXX: compute support -#define IS_COMPUTE_PIPELINE(batch) (batch->ring != I915_EXEC_RENDER) +#define IS_COMPUTE_PIPELINE(batch) (batch->engine != I915_EXEC_RENDER) /** * Emit a series of PIPE_CONTROL commands, taking into account any |