diff options
| -rw-r--r-- | src/gallium/drivers/iris/iris_batch.c | 5 | ||||
| -rw-r--r-- | src/gallium/drivers/iris/iris_batch.h | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/iris/iris_context.c | 9 | ||||
| -rw-r--r-- | src/gallium/drivers/iris/iris_screen.c | 5 |
4 files changed, 19 insertions, 3 deletions
diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c index 5548b8f6c81..f2b7ef697a9 100644 --- a/src/gallium/drivers/iris/iris_batch.c +++ b/src/gallium/drivers/iris/iris_batch.c @@ -157,7 +157,8 @@ iris_init_batch(struct iris_batch *batch, struct pipe_debug_callback *dbg, struct iris_batch *all_batches, enum iris_batch_name name, - uint8_t engine) + uint8_t engine, + int priority) { batch->screen = screen; batch->vtbl = vtbl; @@ -172,6 +173,8 @@ iris_init_batch(struct iris_batch *batch, batch->hw_ctx_id = iris_create_hw_context(screen->bufmgr); assert(batch->hw_ctx_id); + iris_hw_context_set_priority(screen->bufmgr, batch->hw_ctx_id, priority); + util_dynarray_init(&batch->exec_fences, ralloc_context(NULL)); util_dynarray_init(&batch->syncpts, ralloc_context(NULL)); diff --git a/src/gallium/drivers/iris/iris_batch.h b/src/gallium/drivers/iris/iris_batch.h index fc8c588f800..2a68103c379 100644 --- a/src/gallium/drivers/iris/iris_batch.h +++ b/src/gallium/drivers/iris/iris_batch.h @@ -132,7 +132,8 @@ void iris_init_batch(struct iris_batch *batch, struct pipe_debug_callback *dbg, struct iris_batch *all_batches, enum iris_batch_name name, - uint8_t ring); + uint8_t ring, + int priority); void iris_chain_to_new_batch(struct iris_batch *batch); void iris_batch_free(struct iris_batch *batch); void iris_batch_maybe_flush(struct iris_batch *batch, unsigned estimate); diff --git a/src/gallium/drivers/iris/iris_context.c b/src/gallium/drivers/iris/iris_context.c index 60bf8a53720..529c039e537 100644 --- a/src/gallium/drivers/iris/iris_context.c +++ b/src/gallium/drivers/iris/iris_context.c @@ -32,6 +32,7 @@ #include "iris_context.h" #include "iris_resource.h" #include "iris_screen.h" +#include "common/gen_defines.h" #include "common/gen_sample_positions.h" /** @@ -203,10 +204,16 @@ iris_create_context(struct pipe_screen *pscreen, void *priv, unsigned flags) genX_call(devinfo, init_state, ice); genX_call(devinfo, init_blorp, ice); + int priority = 0; + if (flags & PIPE_CONTEXT_HIGH_PRIORITY) + priority = GEN_CONTEXT_HIGH_PRIORITY; + if (flags & PIPE_CONTEXT_LOW_PRIORITY) + priority = GEN_CONTEXT_LOW_PRIORITY; + for (int i = 0; i < IRIS_BATCH_COUNT; i++) { iris_init_batch(&ice->batches[i], screen, &ice->vtbl, &ice->dbg, ice->batches, (enum iris_batch_name) i, - I915_EXEC_RENDER); + I915_EXEC_RENDER, priority); } ice->vtbl.init_render_context(screen, &ice->batches[IRIS_BATCH_RENDER], diff --git a/src/gallium/drivers/iris/iris_screen.c b/src/gallium/drivers/iris/iris_screen.c index 816fcd7add5..909fb876fbe 100644 --- a/src/gallium/drivers/iris/iris_screen.c +++ b/src/gallium/drivers/iris/iris_screen.c @@ -253,6 +253,11 @@ iris_get_param(struct pipe_screen *pscreen, enum pipe_cap param) */ return devinfo->has_llc; + case PIPE_CAP_CONTEXT_PRIORITY_MASK: + return PIPE_CONTEXT_PRIORITY_LOW | + PIPE_CONTEXT_PRIORITY_MEDIUM | + PIPE_CONTEXT_PRIORITY_HIGH; + // XXX: don't hardcode 00:00:02.0 PCI here case PIPE_CAP_PCI_GROUP: return 0; |