drm/i915: Store the intel_context_ops in the intel_engine_cs
If we place a pointer to the engine specific intel_context_ops in the engine itself, we can assign the ops pointer on initialising the context, and then rely on it being set. This simplifies the code in later patches. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190308132522.21573-3-chris@chris-wilson.co.uk
This commit is contained in:
@@ -137,11 +137,6 @@ static void mock_context_destroy(struct intel_context *ce)
|
||||
mock_ring_free(ce->ring);
|
||||
}
|
||||
|
||||
static const struct intel_context_ops mock_context_ops = {
|
||||
.unpin = mock_context_unpin,
|
||||
.destroy = mock_context_destroy,
|
||||
};
|
||||
|
||||
static struct intel_context *
|
||||
mock_context_pin(struct intel_engine_cs *engine,
|
||||
struct i915_gem_context *ctx)
|
||||
@@ -160,8 +155,6 @@ mock_context_pin(struct intel_engine_cs *engine,
|
||||
|
||||
mock_timeline_pin(ce->ring->timeline);
|
||||
|
||||
ce->ops = &mock_context_ops;
|
||||
|
||||
mutex_lock(&ctx->mutex);
|
||||
list_add(&ce->active_link, &ctx->active_engines);
|
||||
mutex_unlock(&ctx->mutex);
|
||||
@@ -174,6 +167,11 @@ err:
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
|
||||
static const struct intel_context_ops mock_context_ops = {
|
||||
.unpin = mock_context_unpin,
|
||||
.destroy = mock_context_destroy,
|
||||
};
|
||||
|
||||
static int mock_request_alloc(struct i915_request *request)
|
||||
{
|
||||
INIT_LIST_HEAD(&request->mock.link);
|
||||
@@ -232,6 +230,7 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915,
|
||||
engine->base.mask = BIT(id);
|
||||
engine->base.status_page.addr = (void *)(engine + 1);
|
||||
|
||||
engine->base.cops = &mock_context_ops;
|
||||
engine->base.context_pin = mock_context_pin;
|
||||
engine->base.request_alloc = mock_request_alloc;
|
||||
engine->base.emit_flush = mock_emit_flush;
|
||||
|
Reference in New Issue
Block a user