drm/i915: Export intel_context_instance()

We want to pass in a intel_context into intel_context_pin() and that
requires us to first be able to lookup the intel_context!

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/20190426163336.15906-2-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson
2019-04-26 17:33:29 +01:00
rodzic 251d46b087
commit fa9f668141
8 zmienionych plików z 83 dodań i 39 usunięć

Wyświetl plik

@@ -1205,11 +1205,17 @@ static struct intel_context *oa_pin_context(struct drm_i915_private *i915,
{
struct intel_engine_cs *engine = i915->engine[RCS0];
struct intel_context *ce;
int ret;
int err;
ret = i915_mutex_lock_interruptible(&i915->drm);
if (ret)
return ERR_PTR(ret);
ce = intel_context_instance(ctx, engine);
if (IS_ERR(ce))
return ce;
err = i915_mutex_lock_interruptible(&i915->drm);
if (err) {
intel_context_put(ce);
return ERR_PTR(err);
}
/*
* As the ID is the gtt offset of the context's vma we
@@ -1217,10 +1223,11 @@ static struct intel_context *oa_pin_context(struct drm_i915_private *i915,
*
* NB: implied RCS engine...
*/
ce = intel_context_pin(ctx, engine);
err = intel_context_pin(ce);
mutex_unlock(&i915->drm.struct_mutex);
if (IS_ERR(ce))
return ce;
intel_context_put(ce);
if (err)
return ERR_PTR(err);
i915->perf.oa.pinned_ctx = ce;