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: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Fixes: 058d88c433
("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: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1477413635-3876-1-git-send-email-tvrtko.ursulin@linux.intel.com
This commit is contained in:
parent
07ee2bce6a
commit
3299e7e434
|
@ -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);
|
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);
|
i915_gem_object_flush_cpu_write_domain(obj);
|
||||||
|
|
||||||
old_write_domain = obj->base.write_domain;
|
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);
|
list_move_tail(&vma->vm_link, &vma->vm->inactive_list);
|
||||||
|
|
||||||
i915_vma_unpin(vma);
|
i915_vma_unpin(vma);
|
||||||
WARN_ON(vma->obj->pin_display > i915_vma_pin_count(vma));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue