[PATCH 19/19] cond-resched

[Chris Wilson]

---
 drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
index 5b65ce738b16..7d6ae2169e2c 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
@@ -205,7 +205,13 @@ i915_gem_shrink(struct drm_i915_private *i915,
 			scanned += obj->base.size >> PAGE_SHIFT;
 			i915_gem_object_put(obj);
 
+			cond_resched();
 			spin_lock_irqsave(&i915->mm.obj_lock, flags);
+			if (fatal_signal_pending(current)) {
+				shrink &= ~(I915_SHRINK_BOUND |
+					    I915_SHRINK_UNBOUND);
+				break;
+			}
 		}
 		list_splice_tail(&still_in_list, phase->list);
 		spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
-- 
2.20.1