diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-08-05 05:14:15 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-08-05 05:54:39 -0400 |
commit | 3b4e896f14b165298d4a85ee4da735633892eeb3 (patch) | |
tree | d35ed1947b12a5cb42d7ab9597ad1993990f2df0 | |
parent | f3f6184c5fab11d57a0c28524db2ddd6a68cb34a (diff) |
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 { | |||
1318 | struct notifier_block oom_notifier; | 1318 | struct notifier_block oom_notifier; |
1319 | struct notifier_block vmap_notifier; | 1319 | struct notifier_block vmap_notifier; |
1320 | struct shrinker shrinker; | 1320 | struct shrinker shrinker; |
1321 | bool shrinker_no_lock_stealing; | ||
1322 | 1321 | ||
1323 | /** LRU list of objects with fence regs on them. */ | 1322 | /** LRU list of objects with fence regs on them. */ |
1324 | struct list_head fence_list; | 1323 | 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) | |||
244 | if (!mutex_is_locked_by(&dev->struct_mutex, current)) | 244 | if (!mutex_is_locked_by(&dev->struct_mutex, current)) |
245 | return false; | 245 | return false; |
246 | 246 | ||
247 | if (to_i915(dev)->mm.shrinker_no_lock_stealing) | ||
248 | return false; | ||
249 | |||
250 | *unlock = false; | 247 | *unlock = false; |
251 | } else | 248 | } else |
252 | *unlock = true; | 249 | *unlock = true; |