Commit 89f98d63 authored by Chris Wilson's avatar Chris Wilson

drm/i915/gt: Push context state allocation earlier

Allow for knowledgeable users to preallocate the context state, and to
separate the allocation step from the pinning step during
intel_context_pin()
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200109085717.873326-1-chris@chris-wilson.co.uk
parent feed5c7b
...@@ -43,24 +43,42 @@ intel_context_create(struct intel_engine_cs *engine) ...@@ -43,24 +43,42 @@ intel_context_create(struct intel_engine_cs *engine)
return ce; return ce;
} }
int __intel_context_do_pin(struct intel_context *ce) int intel_context_alloc_state(struct intel_context *ce)
{ {
int err; int err = 0;
if (mutex_lock_interruptible(&ce->pin_mutex)) if (mutex_lock_interruptible(&ce->pin_mutex))
return -EINTR; return -EINTR;
if (likely(!atomic_read(&ce->pin_count))) { if (!test_bit(CONTEXT_ALLOC_BIT, &ce->flags)) {
intel_wakeref_t wakeref;
if (unlikely(!test_bit(CONTEXT_ALLOC_BIT, &ce->flags))) {
err = ce->ops->alloc(ce); err = ce->ops->alloc(ce);
if (unlikely(err)) if (unlikely(err))
goto err; goto unlock;
set_bit(CONTEXT_ALLOC_BIT, &ce->flags);
}
unlock:
mutex_unlock(&ce->pin_mutex);
return err;
}
__set_bit(CONTEXT_ALLOC_BIT, &ce->flags); int __intel_context_do_pin(struct intel_context *ce)
{
int err;
if (unlikely(!test_bit(CONTEXT_ALLOC_BIT, &ce->flags))) {
err = intel_context_alloc_state(ce);
if (err)
return err;
} }
if (mutex_lock_interruptible(&ce->pin_mutex))
return -EINTR;
if (likely(!atomic_read(&ce->pin_count))) {
intel_wakeref_t wakeref;
err = 0; err = 0;
with_intel_runtime_pm(ce->engine->uncore->rpm, wakeref) with_intel_runtime_pm(ce->engine->uncore->rpm, wakeref)
err = ce->ops->pin(ce); err = ce->ops->pin(ce);
......
...@@ -31,6 +31,8 @@ void intel_context_fini(struct intel_context *ce); ...@@ -31,6 +31,8 @@ void intel_context_fini(struct intel_context *ce);
struct intel_context * struct intel_context *
intel_context_create(struct intel_engine_cs *engine); intel_context_create(struct intel_engine_cs *engine);
int intel_context_alloc_state(struct intel_context *ce);
void intel_context_free(struct intel_context *ce); void intel_context_free(struct intel_context *ce);
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment