From: Tvrtko Ursulin <tursulin@ursulin.net>
To: Intel-gfx@lists.freedesktop.org
Subject: [PATCH 2/2] drm/i915: Remove two invalid warns
Date: Tue, 25 Oct 2016 15:00:24 +0100 [thread overview]
Message-ID: <1477404024-2864-2-git-send-email-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <1477404024-2864-1-git-send-email-tvrtko.ursulin@linux.intel.com>
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Objects can have multiple VMAs used for display in which
case assertion that objects must not be pinned for display
more times than their single display related VMA is incorrect.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
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>
---
drivers/gpu/drm/i915/i915_gem.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 0e26ee96856e..96f48d2c971c 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -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));
}
/**
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-10-25 14:00 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-25 14:00 [PATCH 1/2] drm/i915: Rotated view does not need a fence Tvrtko Ursulin
2016-10-25 14:00 ` Tvrtko Ursulin [this message]
2016-10-25 14:09 ` [PATCH 2/2] drm/i915: Remove two invalid warns Chris Wilson
2016-10-25 14:12 ` Tvrtko Ursulin
2016-10-25 14:16 ` Tvrtko Ursulin
2016-10-25 14:26 ` Chris Wilson
2016-10-25 16:41 ` [PATCH v2 " Tvrtko Ursulin
2016-10-25 14:07 ` [PATCH 1/2] drm/i915: Rotated view does not need a fence Chris Wilson
2016-10-25 16:40 ` [PATCH v2 " Tvrtko Ursulin
2016-10-25 19:55 ` Chris Wilson
2016-10-25 14:12 ` [PATCH " Ville Syrjälä
2016-10-25 14:17 ` Chris Wilson
2016-10-25 14:23 ` Ville Syrjälä
2016-10-25 14:17 ` Tvrtko Ursulin
2016-10-25 15:16 ` ✗ Fi.CI.BAT: warning for series starting with [1/2] " Patchwork
2016-10-25 17:54 ` ✗ Fi.CI.BAT: failure for series starting with [v2,1/2] drm/i915: Rotated view does not need a fence (rev3) Patchwork
2016-10-26 7:46 ` ✓ Fi.CI.BAT: success " Patchwork
2016-10-26 8:10 ` Tvrtko Ursulin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1477404024-2864-2-git-send-email-tvrtko.ursulin@linux.intel.com \
--to=tursulin@ursulin.net \
--cc=Intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.