diff options
author | Chris Wilson | 2016-09-09 15:11:49 +0200 |
---|---|---|
committer | Chris Wilson | 2016-09-09 15:23:03 +0200 |
commit | ea746f3659232b3104d9534d5a7ebd9934ae1dd6 (patch) | |
tree | 20aeb27da021fb0b980a6bdec56a938b572bfe72 /drivers/gpu/drm/i915/i915_gem_evict.c | |
parent | drm/i915: Drop local struct_mutex around intel_init_emon[ilk] (diff) | |
download | kernel-qcow2-linux-ea746f3659232b3104d9534d5a7ebd9934ae1dd6.tar.gz kernel-qcow2-linux-ea746f3659232b3104d9534d5a7ebd9934ae1dd6.tar.xz kernel-qcow2-linux-ea746f3659232b3104d9534d5a7ebd9934ae1dd6.zip |
drm/i915: Expand bool interruptible to pass flags to i915_wait_request()
We need finer control over wakeup behaviour during i915_wait_request(),
so expand the current bool interruptible to a bitmask.
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/20160909131201.16673-9-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_evict.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_evict.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c index 815d5fbe07ac..103085246975 100644 --- a/drivers/gpu/drm/i915/i915_gem_evict.c +++ b/drivers/gpu/drm/i915/i915_gem_evict.c @@ -170,7 +170,7 @@ search_again: if (ret) return ret; - ret = i915_gem_wait_for_idle(dev_priv, true); + ret = i915_gem_wait_for_idle(dev_priv, I915_WAIT_INTERRUPTIBLE); if (ret) return ret; @@ -275,7 +275,7 @@ int i915_gem_evict_vm(struct i915_address_space *vm, bool do_idle) return ret; } - ret = i915_gem_wait_for_idle(dev_priv, true); + ret = i915_gem_wait_for_idle(dev_priv, I915_WAIT_INTERRUPTIBLE); if (ret) return ret; |