diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-08-05 10:14:09 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-08-05 10:54:36 +0100 |
| commit | f826ee21e594438f5f87e1125e0d8f5ad49b749a (patch) | |
| tree | 08cb5f46d005c0f7ae0d7988f8ca15465bc59276 | |
| parent | 8a3b3d576c933d99fe774e9cb88005b87c3fb5c4 (diff) | |
drm/i915/userptr: Remove superfluous interruptible=false on waiting
Inside the kthread context, we can't be interrupted by signals so
touching the mm.interruptible flag is pointless and wait-request now
consumes EIO itself.
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/1470388464-28458-4-git-send-email-chris@chris-wilson.co.uk
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_userptr.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c index 96ab6161903a..57218cca7e05 100644 --- a/drivers/gpu/drm/i915/i915_gem_userptr.c +++ b/drivers/gpu/drm/i915/i915_gem_userptr.c @@ -84,16 +84,9 @@ static void cancel_userptr(struct work_struct *work) obj->userptr.work = NULL; if (obj->pages != NULL) { - struct drm_i915_private *dev_priv = to_i915(dev); - bool was_interruptible; - - was_interruptible = dev_priv->mm.interruptible; - dev_priv->mm.interruptible = false; - + /* We are inside a kthread context and can't be interrupted */ WARN_ON(i915_gem_object_unbind(obj)); WARN_ON(i915_gem_object_put_pages(obj)); - - dev_priv->mm.interruptible = was_interruptible; } i915_gem_object_put(obj); |