diff options
| author | Chris Wilson | 2019-04-08 11:17:03 +0200 |
|---|---|---|
| committer | Chris Wilson | 2019-04-08 18:04:12 +0200 |
| commit | de220cc21967fd745d91fbd3fc23a13372730db8 (patch) | |
| tree | 13143d3fbd12cbcfa8a8ddae25445e647e0b9e82 /drivers/gpu/drm/i915/i915_request.c | |
| parent | drm/i915: Use static allocation for i915_globals_park() (diff) | |
| download | kernel-qcow2-linux-de220cc21967fd745d91fbd3fc23a13372730db8.tar.gz kernel-qcow2-linux-de220cc21967fd745d91fbd3fc23a13372730db8.tar.xz kernel-qcow2-linux-de220cc21967fd745d91fbd3fc23a13372730db8.zip | |
drm/i915: Consolidate the timeline->barrier
The timeline is strictly ordered, so by inserting the timeline->barrier
request into the timeline->last_request it naturally provides the same
barrier. Consolidate the pair of barriers into one as they serve the
same purpose.
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/20190408091728.20207-4-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_request.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_request.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c index 2da0d6436a1a..96a9e8bcd805 100644 --- a/drivers/gpu/drm/i915/i915_request.c +++ b/drivers/gpu/drm/i915/i915_request.c @@ -584,11 +584,6 @@ out: return kmem_cache_alloc(global.slab_requests, GFP_KERNEL); } -static int add_timeline_barrier(struct i915_request *rq) -{ - return i915_request_await_active_request(rq, &rq->timeline->barrier); -} - /** * i915_request_alloc - allocate a request structure * @@ -738,10 +733,6 @@ i915_request_alloc(struct intel_engine_cs *engine, struct i915_gem_context *ctx) */ rq->head = rq->ring->emit; - ret = add_timeline_barrier(rq); - if (ret) - goto err_unwind; - ret = engine->request_alloc(rq); if (ret) goto err_unwind; |