summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem_userptr.c
diff options
context:
space:
mode:
authorChris Wilson2016-09-09 15:11:49 +0200
committerChris Wilson2016-09-09 15:23:03 +0200
commitea746f3659232b3104d9534d5a7ebd9934ae1dd6 (patch)
tree20aeb27da021fb0b980a6bdec56a938b572bfe72 /drivers/gpu/drm/i915/i915_gem_userptr.c
parentdrm/i915: Drop local struct_mutex around intel_init_emon[ilk] (diff)
downloadkernel-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_userptr.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem_userptr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c
index be54825ef3e8..e537930c64b5 100644
--- a/drivers/gpu/drm/i915/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/i915_gem_userptr.c
@@ -68,7 +68,7 @@ static void wait_rendering(struct drm_i915_gem_object *obj)
for_each_active(active, idx)
i915_gem_active_wait_unlocked(&obj->last_read[idx],
- false, NULL, NULL);
+ 0, NULL, NULL);
}
static void cancel_userptr(struct work_struct *work)