]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Allow shrinking of userptr objects once again
authorTvrtko Ursulin <tvrtko.ursulin@intel.com>
Tue, 1 Nov 2016 14:44:10 +0000 (14:44 +0000)
committerTvrtko Ursulin <tvrtko.ursulin@intel.com>
Tue, 1 Nov 2016 16:35:26 +0000 (16:35 +0000)
commitcee93339a18bc307e1137e9bf27cd5578fcec0fd
tree546a0f4c1006274c57cc4e0cbe8cd2fcac2ea26a
parent6173a426e177de14ecc7f3674d7171c665e37d3c
drm/i915: Allow shrinking of userptr objects once again

Commit f661a33004b7 ("drm/i915/shrinker: Only shmemfs objects
are backed by swap") stopped considering the userptr objects
in shrinker callbacks.

Restore that so idle userptr objects can be discarded in order
to free up memory.

One change further to what was introduced in f661a33004b7 is
to start considering userptr objects in oom but that should
also be a correct thing to do.

v2: Introduce I915_GEM_OBJECT_IS_SHRINKABLE. (Chris Wilson)

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Fixes: f661a33004b7 ("drm/i915/shrinker: Only shmemfs objects are backed by swap")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: <stable@vger.kernel.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1478011450-6634-1-git-send-email-tvrtko.ursulin@linux.intel.com
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_internal.c
drivers/gpu/drm/i915/i915_gem_shrinker.c
drivers/gpu/drm/i915/i915_gem_userptr.c