Commit a6631ae1 authored May 06, 2015 by Joonas Lahtinen Committed by Daniel Vetter May 08, 2015

drm/i915: Consider object pinned if any VMA is pinned



Do not skip special GGTT views when considering whether an object
is pinned or not.

Wrong behaviour was introduced in;

commit ec7adb6e
Author: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Date:   Mon Mar 16 14:11:13 2015 +0200

    drm/i915: Do not use ggtt_view with (aliasing) PPGTT

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 91e6711e

drivers/gpu/drm/i915/i915_gem.c

+2 −5

Original line number	Original line	Diff line number	Diff line
	@@ -5244,13 +5244,10 @@ unsigned long i915_gem_obj_size(struct drm_i915_gem_object *o,
	bool i915_gem_obj_is_pinned(struct drm_i915_gem_object *obj)		bool i915_gem_obj_is_pinned(struct drm_i915_gem_object *obj)
	{		{
	struct i915_vma *vma;		struct i915_vma *vma;
	list_for_each_entry(vma, &obj->vma_list, vma_link) {		list_for_each_entry(vma, &obj->vma_list, vma_link)
	if (i915_is_ggtt(vma->vm) &&
	vma->ggtt_view.type != I915_GGTT_VIEW_NORMAL)
	continue;
	if (vma->pin_count > 0)		if (vma->pin_count > 0)
	return true;		return true;
	}
	return false;		return false;
	}		}