Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80dcfdbd authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915: Rework __i915_gem_shrink 



In order to do this for all VMs, it's convenient to rework the logic a
bit. This should have no functional impact.

Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 0b02e798

drivers/gpu/drm/i915/i915_gem.c

+8 −3
Original line number Diff line number Diff line
@@ -1707,9 +1707,14 @@ __i915_gem_shrink(struct drm_i915_private *dev_priv, long target, 
	}



	list_for_each_entry_safe(obj, next, &vm->inactive_list, mm_list) {

		if ((i915_gem_object_is_purgeable(obj) || !purgeable_only) &&

		    i915_gem_object_unbind(obj) == 0 &&

		    i915_gem_object_put_pages(obj) == 0) {



		if (!i915_gem_object_is_purgeable(obj) && purgeable_only)

			continue;



		if (i915_gem_object_unbind(obj))

			continue;



		if (!i915_gem_object_put_pages(obj)) {

			count += obj->base.size >> PAGE_SHIFT;

			if (count >= target)

				return count;