Commit d8ccba86 authored Dec 17, 2013 by Daniel Vetter

drm/i915: grab a pages pin count for preallocate stolen



But only when we indeed set up a gtt mapping. We need this since the
vma also holds a pages_pin_count, on top of the unconditional
pages_pin_count we grab for all stolen objects (to avoid swap-out).

This should avoid a pages_pin_count underrun when cleaning up
framebuffers objects taken over from the BIOS.

Chris mentioned in his review that this bug even predates the vma
conversion.

Reported-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Ben Widawsky <benjamin.widawsky@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 820c1980

drivers/gpu/drm/i915/i915_gem_stolen.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -420,6 +420,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,

		list_add_tail(&obj->global_list, &dev_priv->mm.bound_list);
		list_add_tail(&vma->mm_list, &ggtt->inactive_list);
		i915_gem_object_pin_pages(obj);

		return obj;