Skip to content

Commit

Permalink
drm/i915: Immediately execute the fenced work
Browse files Browse the repository at this point in the history
If the caller allows and we do not have to wait for any signals,
immediately execute the work within the caller's process. By doing so we
avoid the overhead of scheduling a new task, and the latency in
executing it, at the cost of pulling that work back into the immediate
context. (Sometimes we still prefer to offload the task to another cpu,
especially if we plan on executing many such tasks in parallel for this
client.)

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/20200325120227.8044-2-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson committed Mar 25, 2020
1 parent 6670b41 commit 92581f9
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -1822,7 +1822,7 @@ static int eb_parse_pipeline(struct i915_execbuffer *eb,
dma_resv_add_excl_fence(shadow->resv, &pw->base.dma);
dma_resv_unlock(shadow->resv);

dma_fence_work_commit(&pw->base);
dma_fence_work_commit_imm(&pw->base);
return 0;

err_batch_unlock:
Expand Down
5 changes: 4 additions & 1 deletion drivers/gpu/drm/i915/i915_sw_fence_work.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ fence_notify(struct i915_sw_fence *fence, enum i915_sw_fence_notify state)

if (!f->dma.error) {
dma_fence_get(&f->dma);
queue_work(system_unbound_wq, &f->work);
if (test_bit(DMA_FENCE_WORK_IMM, &f->dma.flags))
fence_work(&f->work);
else
queue_work(system_unbound_wq, &f->work);
} else {
fence_complete(f);
}
Expand Down
23 changes: 23 additions & 0 deletions drivers/gpu/drm/i915/i915_sw_fence_work.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ struct dma_fence_work {
const struct dma_fence_work_ops *ops;
};

enum {
DMA_FENCE_WORK_IMM = DMA_FENCE_FLAG_USER_BITS,
};

void dma_fence_work_init(struct dma_fence_work *f,
const struct dma_fence_work_ops *ops);
int dma_fence_work_chain(struct dma_fence_work *f, struct dma_fence *signal);
Expand All @@ -41,4 +45,23 @@ static inline void dma_fence_work_commit(struct dma_fence_work *f)
i915_sw_fence_commit(&f->chain);
}

/**
* dma_fence_work_commit_imm: Commit the fence, and if possible execute locally.
* @f: the fenced worker
*
* Instead of always scheduling a worker to execute the callback (see
* dma_fence_work_commit()), we try to execute the callback immediately in
* the local context. It is required that the fence be committed before it
* is published, and that no other threads try to tamper with the number
* of asynchronous waits on the fence (or else the callback will be
* executed in the wrong context, i.e. not the callers).
*/
static inline void dma_fence_work_commit_imm(struct dma_fence_work *f)
{
if (atomic_read(&f->chain.pending) <= 1)
__set_bit(DMA_FENCE_WORK_IMM, &f->dma.flags);

dma_fence_work_commit(f);
}

#endif /* I915_SW_FENCE_WORK_H */
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/i915_vma.c
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,7 @@ int i915_vma_pin(struct i915_vma *vma, u64 size, u64 alignment, u64 flags)
mutex_unlock(&vma->vm->mutex);
err_fence:
if (work)
dma_fence_work_commit(&work->base);
dma_fence_work_commit_imm(&work->base);
if (wakeref)
intel_runtime_pm_put(&vma->vm->i915->runtime_pm, wakeref);
err_pages:
Expand Down

0 comments on commit 92581f9

Please sign in to comment.