Module: Mesa Branch: master Commit: 343f41781c17a9db37f8872f1c4018cd58330417 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=343f41781c17a9db37f8872f1c4018cd58330417
Author: Kenneth Graunke <[email protected]> Date: Tue May 7 22:26:22 2019 -0700 iris: Hook up device reset callbacks This mechanism lets the driver inform the state tracker about GPU resets, say for destroying a robust API context and reporting a "device lost" error to the application, making it take action to deal with this. --- src/gallium/drivers/iris/iris_batch.c | 7 +++++++ src/gallium/drivers/iris/iris_batch.h | 2 ++ src/gallium/drivers/iris/iris_context.c | 15 ++++++++++++++- src/gallium/drivers/iris/iris_context.h | 3 +++ 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c index f3d2e569aa7..881531b9782 100644 --- a/src/gallium/drivers/iris/iris_batch.c +++ b/src/gallium/drivers/iris/iris_batch.c @@ -163,6 +163,7 @@ iris_init_batch(struct iris_batch *batch, struct iris_screen *screen, struct iris_vtable *vtbl, struct pipe_debug_callback *dbg, + struct pipe_device_reset_callback *reset, struct iris_batch *all_batches, enum iris_batch_name name, uint8_t engine, @@ -171,6 +172,7 @@ iris_init_batch(struct iris_batch *batch, batch->screen = screen; batch->vtbl = vtbl; batch->dbg = dbg; + batch->reset = reset; batch->name = name; /* engine should be one of I915_EXEC_RENDER, I915_EXEC_BLT, etc. */ @@ -611,6 +613,11 @@ _iris_batch_flush(struct iris_batch *batch, const char *file, int line) * dubiously claim success... */ if (ret == -EIO && replace_hw_ctx(batch)) { + if (batch->reset->reset) { + /* Tell the state tracker the device is lost and it was our fault. */ + batch->reset->reset(batch->reset->data, PIPE_GUILTY_CONTEXT_RESET); + } + ret = 0; } diff --git a/src/gallium/drivers/iris/iris_batch.h b/src/gallium/drivers/iris/iris_batch.h index 2a68103c379..747ad72d166 100644 --- a/src/gallium/drivers/iris/iris_batch.h +++ b/src/gallium/drivers/iris/iris_batch.h @@ -58,6 +58,7 @@ struct iris_batch { struct iris_screen *screen; struct iris_vtable *vtbl; struct pipe_debug_callback *dbg; + struct pipe_device_reset_callback *reset; /** What batch is this? (e.g. IRIS_BATCH_RENDER/COMPUTE) */ enum iris_batch_name name; @@ -130,6 +131,7 @@ void iris_init_batch(struct iris_batch *batch, struct iris_screen *screen, struct iris_vtable *vtbl, struct pipe_debug_callback *dbg, + struct pipe_device_reset_callback *reset, struct iris_batch *all_batches, enum iris_batch_name name, uint8_t ring, diff --git a/src/gallium/drivers/iris/iris_context.c b/src/gallium/drivers/iris/iris_context.c index 7ed4fdcd8d7..5d4d27edf4e 100644 --- a/src/gallium/drivers/iris/iris_context.c +++ b/src/gallium/drivers/iris/iris_context.c @@ -102,6 +102,18 @@ iris_lost_context_state(struct iris_batch *batch) } static void +iris_set_device_reset_callback(struct pipe_context *ctx, + const struct pipe_device_reset_callback *cb) +{ + struct iris_context *ice = (struct iris_context *)ctx; + + if (cb) + ice->reset = *cb; + else + memset(&ice->reset, 0, sizeof(ice->reset)); +} + +static void iris_get_sample_position(struct pipe_context *ctx, unsigned sample_count, unsigned sample_index, @@ -210,6 +222,7 @@ iris_create_context(struct pipe_screen *pscreen, void *priv, unsigned flags) ctx->destroy = iris_destroy_context; ctx->set_debug_callback = iris_set_debug_callback; + ctx->set_device_reset_callback = iris_set_device_reset_callback; ctx->get_sample_position = iris_get_sample_position; ice->shaders.urb_size = devinfo->urb.size; @@ -250,7 +263,7 @@ iris_create_context(struct pipe_screen *pscreen, void *priv, unsigned flags) 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, + &ice->reset, ice->batches, (enum iris_batch_name) i, I915_EXEC_RENDER, priority); } diff --git a/src/gallium/drivers/iris/iris_context.h b/src/gallium/drivers/iris/iris_context.h index 4501c4fcad9..b6d44d637a6 100644 --- a/src/gallium/drivers/iris/iris_context.h +++ b/src/gallium/drivers/iris/iris_context.h @@ -440,6 +440,9 @@ struct iris_context { /** A debug callback for KHR_debug output. */ struct pipe_debug_callback dbg; + /** A device reset status callback for notifying that the GPU is hosed. */ + struct pipe_device_reset_callback reset; + /** Slab allocator for iris_transfer_map objects. */ struct slab_child_pool transfer_pool; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
