diff options
| author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2016-10-25 12:41:12 -0400 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2016-10-28 08:24:15 -0400 |
| commit | 7e9b3f95d64165f37c6448fe624d835c5adf17b9 (patch) | |
| tree | 5b90cb846f7f24747a8aac8d1efcb42d1e9ccf1d /drivers/gpu | |
| parent | 6d9deb910c8eee8728129326dc88ec109b03b135 (diff) | |
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: 058d88c4330f ("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 3299e7e43484a85eeb5c7ec09958bff05c9d0543)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index e1053c4949f4..23960de81b57 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
| @@ -3550,8 +3550,6 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj, | |||
| 3550 | 3550 | ||
| 3551 | vma->display_alignment = max_t(u64, vma->display_alignment, alignment); | 3551 | vma->display_alignment = max_t(u64, vma->display_alignment, alignment); |
| 3552 | 3552 | ||
| 3553 | WARN_ON(obj->pin_display > i915_vma_pin_count(vma)); | ||
| 3554 | |||
| 3555 | i915_gem_object_flush_cpu_write_domain(obj); | 3553 | i915_gem_object_flush_cpu_write_domain(obj); |
| 3556 | 3554 | ||
| 3557 | old_write_domain = obj->base.write_domain; | 3555 | old_write_domain = obj->base.write_domain; |
| @@ -3588,7 +3586,6 @@ i915_gem_object_unpin_from_display_plane(struct i915_vma *vma) | |||
| 3588 | list_move_tail(&vma->vm_link, &vma->vm->inactive_list); | 3586 | list_move_tail(&vma->vm_link, &vma->vm->inactive_list); |
| 3589 | 3587 | ||
| 3590 | i915_vma_unpin(vma); | 3588 | i915_vma_unpin(vma); |
| 3591 | WARN_ON(vma->obj->pin_display > i915_vma_pin_count(vma)); | ||
| 3592 | } | 3589 | } |
| 3593 | 3590 | ||
| 3594 | /** | 3591 | /** |