Skip to content

Commit

Permalink
drm/i915: Remove two invalid warns
Browse files Browse the repository at this point in the history
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: 058d88c ("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
(cherry picked from commit 3299e7e)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
  • Loading branch information
Tvrtko Ursulin authored and Jani Nikula committed Oct 28, 2016
1 parent 6d9deb9 commit 7e9b3f9
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions drivers/gpu/drm/i915/i915_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -3550,8 +3550,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;
Expand Down Expand Up @@ -3588,7 +3586,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));
}

/**
Expand Down

0 comments on commit 7e9b3f9

Please sign in to comment.