Commit a2165e31 authored Dec 03, 2012 by Chris Wilson Committed by Daniel Vetter Dec 03, 2012

drm/i915: Decouple the object from the unbound list before freeing pages



As we may actually allocate in order to save the physical swizzling bits
during the free, we have to be careful not to trigger the shrinker on
the same object.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
[danvet: Added a small comment in the code to really drive the
scariness of this patch home.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 7b01e260

drivers/gpu/drm/i915/i915_gem.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -1696,10 +1696,14 @@ i915_gem_object_put_pages(struct drm_i915_gem_object *obj)
		if (obj->pages_pin_count)
		return -EBUSY;

		/* ->put_pages might need to allocate memory for the bit17 swizzle
		* array, hence protect them from being reaped by removing them from gtt
		* lists early. */
		list_del(&obj->gtt_list);

		ops->put_pages(obj);
		obj->pages = NULL;

		list_del(&obj->gtt_list);
		if (i915_gem_object_is_purgeable(obj))
		i915_gem_object_truncate(obj);