@@ -885,6 +885,7 @@ struct intel_context {
struct drm_i915_gem_object *state;
struct intel_ring *ring;
int pin_count;
+ bool initialised;
} engine[I915_NUM_RINGS];
struct list_head link;
@@ -482,14 +482,9 @@ static int execlists_context_queue(struct drm_i915_gem_request *request)
int intel_logical_ring_alloc_request_extras(struct drm_i915_gem_request *request)
{
+ struct intel_engine_cs *engine = request->engine;
int ret;
- request->ring = request->ctx->engine[request->engine->id].ring;
-
- ret = intel_lr_context_pin(request->ctx, request->engine);
- if (ret)
- return ret;
-
if (i915.enable_guc_submission) {
/*
* Check that the GuC has space for the request before
@@ -503,6 +498,21 @@ int intel_logical_ring_alloc_request_extras(struct drm_i915_gem_request *request
return ret;
}
+ request->ring = request->ctx->engine[engine->id].ring;
+
+ ret = intel_lr_context_pin(request->ctx, engine);
+ if (ret)
+ return ret;
+
+ if (!request->ctx->engine[engine->id].initialised) {
+ ret = engine->init_context(request);
+ if (ret) {
+ intel_lr_context_unpin(request->ctx, engine);
+ return ret;
+ }
+ request->ctx->engine[engine->id].initialised = true;
+ }
+
return 0;
}
@@ -1968,26 +1978,8 @@ int intel_lr_context_deferred_alloc(struct intel_context *ctx,
ctx->engine[engine->id].ring = ring;
ctx->engine[engine->id].state = ctx_obj;
+ ctx->engine[engine->id].initialised = engine->init_context == NULL;
- if (ctx != engine->default_context && engine->init_context) {
- struct drm_i915_gem_request *req;
-
- req = i915_gem_request_alloc(engine, ctx);
- if (IS_ERR(req)) {
- DRM_ERROR("ring create req: %d\n",
- ret);
- goto error_ringbuf;
- }
-
- ret = engine->init_context(req);
- if (ret) {
- DRM_ERROR("ring init context: %d\n",
- ret);
- i915_gem_request_cancel(req);
- goto error_ringbuf;
- }
- i915_add_request_no_flush(req);
- }
return 0;
error_ringbuf:
Instead of allocating a new request when allocating a context, use the request that initiated the allocation to emit the context initialisation. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_lrc.c | 42 ++++++++++++++++------------------------ 2 files changed, 18 insertions(+), 25 deletions(-)