diff options
| author | Chris Wilson | 2017-02-23 08:44:13 +0100 |
|---|---|---|
| committer | Chris Wilson | 2017-02-23 15:49:31 +0100 |
| commit | fe49789fab974dd04c0fef26a4ce7f7f411b40dd (patch) | |
| tree | 52d8369c7bc75219143b387e96a265bc1b681aaa /drivers/gpu/drm/i915/i915_gem_request.h | |
| parent | drm/i915: Inline __i915_gem_request_wait_for_execute() (diff) | |
| download | kernel-qcow2-linux-fe49789fab974dd04c0fef26a4ce7f7f411b40dd.tar.gz kernel-qcow2-linux-fe49789fab974dd04c0fef26a4ce7f7f411b40dd.tar.xz kernel-qcow2-linux-fe49789fab974dd04c0fef26a4ce7f7f411b40dd.zip | |
drm/i915: Deconstruct execute fence
On reflection, we are only using the execute fence as a waitqueue on the
global_seqno and not using it for dependency tracking between fences
(unlike the submit and dma fences). By only treating it as a waitqueue,
we can then treat it similar to the other waitqueues during submit,
making the code simpler.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170223074422.4125-8-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_request.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_request.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_request.h b/drivers/gpu/drm/i915/i915_gem_request.h index 9049936c571c..467d3e13fce0 100644 --- a/drivers/gpu/drm/i915/i915_gem_request.h +++ b/drivers/gpu/drm/i915/i915_gem_request.h @@ -119,18 +119,10 @@ struct drm_i915_gem_request { * The submit fence is used to await upon all of the request's * dependencies. When it is signaled, the request is ready to run. * It is used by the driver to then queue the request for execution. - * - * The execute fence is used to signal when the request has been - * sent to hardware. - * - * It is illegal for the submit fence of one request to wait upon the - * execute fence of an earlier request. It should be sufficient to - * wait upon the submit fence of the earlier request. */ struct i915_sw_fence submit; - struct i915_sw_fence execute; wait_queue_t submitq; - wait_queue_t execq; + wait_queue_head_t execute; /* A list of everyone we wait upon, and everyone who waits upon us. * Even though we will not be submitted to the hardware before the |