diff options
| author | Chris Wilson | 2016-10-28 14:58:24 +0200 |
|---|---|---|
| committer | Chris Wilson | 2016-10-28 21:53:41 +0200 |
| commit | b52992c06c9020cecb1b9807855301e5f62ec968 (patch) | |
| tree | bd24627a7d623d1e646c54aca199825e501c7c24 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915: Remove insert-page shortcut from execbuf relocate_iomap() (diff) | |
| download | kernel-qcow2-linux-b52992c06c9020cecb1b9807855301e5f62ec968.tar.gz kernel-qcow2-linux-b52992c06c9020cecb1b9807855301e5f62ec968.tar.xz kernel-qcow2-linux-b52992c06c9020cecb1b9807855301e5f62ec968.zip | |
drm/i915: Support asynchronous waits on struct fence from i915_gem_request
We will need to wait on DMA completion (as signaled via struct fence)
before executing our i915_gem_request. Therefore we want to expose a
method for adding the await on the fence itself to the request.
v2: Add a comment detailing a failure to handle a signal-on-any
fence-array.
v3: Pretend that magic numbers don't exist.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161028125858.23563-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 87018df94d68..0c186b75ec86 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -114,7 +114,7 @@ i915_gem_wait_for_error(struct i915_gpu_error *error) */ ret = wait_event_interruptible_timeout(error->reset_queue, !i915_reset_in_progress(error), - 10*HZ); + I915_RESET_TIMEOUT); if (ret == 0) { DRM_ERROR("Timed out waiting for the gpu reset to complete\n"); return -EIO; |