[PATCH 62/63] drm/i915/gem: Remove timeline nesting from snb relocs
Chris Wilson
chris at chris-wilson.co.uk
Fri Jul 10 14:36:01 UTC 2020
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index 0276c6fc2dc3..7518db950bf3 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -1965,16 +1965,9 @@ nested_request_create(struct intel_context *ce, struct i915_execbuffer *eb)
{
struct i915_request *rq;
- /* XXX This only works once; replace with shared timeline */
- if (ce->timeline != eb->context->timeline)
- mutex_lock_nested(&ce->timeline->mutex, SINGLE_DEPTH_NESTING);
intel_context_enter(ce);
-
rq = __i915_request_create(ce, GFP_KERNEL);
-
intel_context_exit(ce);
- if (IS_ERR(rq) && ce->timeline != eb->context->timeline)
- mutex_unlock(&ce->timeline->mutex);
return rq;
}
@@ -2021,9 +2014,6 @@ reloc_gpu_flush(struct i915_execbuffer *eb, struct i915_request *rq, int err)
intel_gt_chipset_flush(rq->engine->gt);
__i915_request_add(rq, &eb->gem_context->sched);
- if (i915_request_timeline(rq) != eb->context->timeline)
- mutex_unlock(&i915_request_timeline(rq)->mutex);
-
return err;
}
@@ -2426,10 +2416,7 @@ static struct i915_request *reloc_gpu_alloc(struct i915_execbuffer *eb)
struct reloc_cache *cache = &eb->reloc_cache;
struct i915_request *rq;
- if (cache->ce == eb->context)
- rq = __i915_request_create(cache->ce, GFP_KERNEL);
- else
- rq = nested_request_create(cache->ce, eb);
+ rq = nested_request_create(cache->ce, eb);
if (IS_ERR(rq))
return rq;
@@ -2979,6 +2966,8 @@ static int __eb_pin_reloc_engine(struct i915_execbuffer *eb)
i915_vm_put(ce->vm);
ce->vm = i915_vm_get(eb->context->vm);
+ ce->timeline = intel_timeline_get(eb->context->timeline);
+
err = intel_context_pin(ce);
if (err)
return err;
--
2.20.1
More information about the Intel-gfx-trybot
mailing list