From: Chris Wilson <chris@chris-wilson.co.uk> To: intel-gfx@lists.freedesktop.org Subject: [PATCH 1/3] drm/i915: Handle i915_active_fence_set() with the same fence Date: Wed, 6 Nov 2019 15:48:08 +0000 [thread overview] Message-ID: <20191106154810.5843-1-chris@chris-wilson.co.uk> (raw) If the caller wants to overwrite the currently tracked fence, with itself, as far as the tracking is concerned it is a no-op, so simply allow it. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> --- drivers/gpu/drm/i915/i915_active.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_active.c b/drivers/gpu/drm/i915/i915_active.c index 207383dda84d..cde984744f20 100644 --- a/drivers/gpu/drm/i915/i915_active.c +++ b/drivers/gpu/drm/i915/i915_active.c @@ -759,7 +759,9 @@ __i915_active_fence_set(struct i915_active_fence *active, prev = rcu_dereference_protected(active->fence, active_is_held(active)); if (prev) { - GEM_BUG_ON(prev == fence); + if (unlikely(prev == fence)) + goto unlock; + spin_lock_nested(prev->lock, SINGLE_DEPTH_NESTING); __list_del_entry(&active->cb.node); spin_unlock(prev->lock); /* serialise with prev->cb_list */ @@ -781,6 +783,7 @@ __i915_active_fence_set(struct i915_active_fence *active, rcu_assign_pointer(active->fence, fence); list_add_tail(&active->cb.node, &fence->cb_list); +unlock: spin_unlock_irqrestore(fence->lock, flags); return prev; -- 2.24.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Chris Wilson <chris@chris-wilson.co.uk> To: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 1/3] drm/i915: Handle i915_active_fence_set() with the same fence Date: Wed, 6 Nov 2019 15:48:08 +0000 [thread overview] Message-ID: <20191106154810.5843-1-chris@chris-wilson.co.uk> (raw) Message-ID: <20191106154808.0QeCHx143asj-CQ0x-3WhT4KFfiWLZ_xU9nhzCoh9N8@z> (raw) If the caller wants to overwrite the currently tracked fence, with itself, as far as the tracking is concerned it is a no-op, so simply allow it. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> --- drivers/gpu/drm/i915/i915_active.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_active.c b/drivers/gpu/drm/i915/i915_active.c index 207383dda84d..cde984744f20 100644 --- a/drivers/gpu/drm/i915/i915_active.c +++ b/drivers/gpu/drm/i915/i915_active.c @@ -759,7 +759,9 @@ __i915_active_fence_set(struct i915_active_fence *active, prev = rcu_dereference_protected(active->fence, active_is_held(active)); if (prev) { - GEM_BUG_ON(prev == fence); + if (unlikely(prev == fence)) + goto unlock; + spin_lock_nested(prev->lock, SINGLE_DEPTH_NESTING); __list_del_entry(&active->cb.node); spin_unlock(prev->lock); /* serialise with prev->cb_list */ @@ -781,6 +783,7 @@ __i915_active_fence_set(struct i915_active_fence *active, rcu_assign_pointer(active->fence, fence); list_add_tail(&active->cb.node, &fence->cb_list); +unlock: spin_unlock_irqrestore(fence->lock, flags); return prev; -- 2.24.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2019-11-06 15:48 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-06 15:48 Chris Wilson [this message] 2019-11-06 15:48 ` [Intel-gfx] [PATCH 1/3] drm/i915: Handle i915_active_fence_set() with the same fence Chris Wilson 2019-11-06 15:48 ` [PATCH 2/3] drm/i915: Drop inspection of execbuf flags during evict Chris Wilson 2019-11-06 15:48 ` [Intel-gfx] " Chris Wilson 2019-11-08 9:54 ` Daniel Vetter 2019-11-08 9:54 ` [Intel-gfx] " Daniel Vetter 2019-11-08 10:11 ` Chris Wilson 2019-11-08 10:11 ` [Intel-gfx] " Chris Wilson 2019-11-08 10:20 ` Daniel Vetter 2019-11-08 10:20 ` [Intel-gfx] " Daniel Vetter 2019-11-08 10:40 ` Chris Wilson 2019-11-08 10:40 ` [Intel-gfx] " Chris Wilson 2019-11-08 16:06 ` Daniel Vetter 2019-11-08 16:06 ` [Intel-gfx] " Daniel Vetter 2019-11-06 15:48 ` [PATCH 3/3] drm/i915/gem: Extract transient execbuf flags from i915_vma Chris Wilson 2019-11-06 15:48 ` [Intel-gfx] " Chris Wilson 2019-11-08 9:53 ` Daniel Vetter 2019-11-08 9:53 ` [Intel-gfx] " Daniel Vetter 2019-11-08 10:05 ` Chris Wilson 2019-11-08 10:05 ` [Intel-gfx] " Chris Wilson 2019-11-08 16:13 ` Daniel Vetter 2019-11-08 16:13 ` [Intel-gfx] " Daniel Vetter 2019-11-06 19:22 ` ✓ Fi.CI.BAT: success for series starting with [1/3] drm/i915: Handle i915_active_fence_set() with the same fence Patchwork 2019-11-06 19:22 ` [Intel-gfx] " Patchwork 2019-11-08 10:37 ` [PATCH 1/3] " Tvrtko Ursulin 2019-11-08 10:37 ` [Intel-gfx] " Tvrtko Ursulin 2019-11-08 10:42 ` Chris Wilson 2019-11-08 10:42 ` [Intel-gfx] " Chris Wilson 2019-11-08 12:00 ` ✗ Fi.CI.IGT: failure for series starting with [1/3] " Patchwork 2019-11-08 12:00 ` [Intel-gfx] " Patchwork
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=20191106154810.5843-1-chris@chris-wilson.co.uk \ --to=chris@chris-wilson.co.uk \ --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: linkBe 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.