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

Commit 3299e7e4 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Remove two invalid warns 



Objects can have multiple VMAs used for display in which
case assertion that objects must not be pinned for display
more times than the current VMA is incorrect.

v2: Commit message update. (Chris Wilson)

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Fixes: 058d88c4 ("drm/i915: Track pinned VMA")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1477413635-3876-1-git-send-email-tvrtko.ursulin@linux.intel.com
parent 07ee2bce

drivers/gpu/drm/i915/i915_gem.c

+0 −3
Original line number Diff line number Diff line
@@ -3595,8 +3595,6 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj, 


	vma->display_alignment = max_t(u64, vma->display_alignment, alignment);



	WARN_ON(obj->pin_display > i915_vma_pin_count(vma));



	i915_gem_object_flush_cpu_write_domain(obj);



	old_write_domain = obj->base.write_domain;
@@ -3633,7 +3631,6 @@ i915_gem_object_unpin_from_display_plane(struct i915_vma *vma) 
		list_move_tail(&vma->vm_link, &vma->vm->inactive_list);



	i915_vma_unpin(vma);

	WARN_ON(vma->obj->pin_display > i915_vma_pin_count(vma));

}



/**