diff options
| author | Chris Wilson | 2016-08-05 11:14:15 +0200 |
|---|---|---|
| committer | Chris Wilson | 2016-08-05 11:54:39 +0200 |
| commit | 3b4e896f14b165298d4a85ee4da735633892eeb3 (patch) | |
| tree | d35ed1947b12a5cb42d7ab9597ad1993990f2df0 | |
| parent | drm/i915: Tidy generation of the GTT mmap offset (diff) | |
| download | kernel-qcow2-linux-3b4e896f14b165298d4a85ee4da735633892eeb3.tar.gz kernel-qcow2-linux-3b4e896f14b165298d4a85ee4da735633892eeb3.tar.xz kernel-qcow2-linux-3b4e896f14b165298d4a85ee4da735633892eeb3.zip | |
drm/i915: Remove unused no-shrinker-steal
After removing the user of this wart, we can remove the wart entirely.
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-10-git-send-email-chris@chris-wilson.co.uk
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_shrinker.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 6eff31202336..31a614fe9ed7 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1318,7 +1318,6 @@ struct i915_gem_mm { struct notifier_block oom_notifier; struct notifier_block vmap_notifier; struct shrinker shrinker; - bool shrinker_no_lock_stealing; /** LRU list of objects with fence regs on them. */ struct list_head fence_list; diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c index 9b92b6470ccc..b80802b35353 100644 --- a/drivers/gpu/drm/i915/i915_gem_shrinker.c +++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c @@ -244,9 +244,6 @@ static bool i915_gem_shrinker_lock(struct drm_device *dev, bool *unlock) if (!mutex_is_locked_by(&dev->struct_mutex, current)) return false; - if (to_i915(dev)->mm.shrinker_no_lock_stealing) - return false; - *unlock = false; } else *unlock = true; |