All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chris Wilson <chris@chris-wilson.co.uk>
To: intel-gfx@lists.freedesktop.org
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [Intel-gfx] [PATCH 27/33] drm/i915: Encode fence specific waitqueue behaviour into the wait.flags
Date: Fri, 13 Nov 2020 09:41:22 +0000	[thread overview]
Message-ID: <20201113094128.8740-27-chris@chris-wilson.co.uk> (raw)
In-Reply-To: <20201113094128.8740-1-chris@chris-wilson.co.uk>

Use the wait_queue_entry.flags to denote the special fence behaviour
(flattening continuations along fence chains, and for propagating
errors) rather than trying to detect ordinary waiters by their
functions.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/i915_sw_fence.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c
index 038d4c6884c5..2744558f3050 100644
--- a/drivers/gpu/drm/i915/i915_sw_fence.c
+++ b/drivers/gpu/drm/i915/i915_sw_fence.c
@@ -18,10 +18,15 @@
 #define I915_SW_FENCE_BUG_ON(expr) BUILD_BUG_ON_INVALID(expr)
 #endif
 
-#define I915_SW_FENCE_FLAG_ALLOC BIT(3) /* after WQ_FLAG_* for safety */
-
 static DEFINE_SPINLOCK(i915_sw_fence_lock);
 
+#define WQ_FLAG_BITS \
+	BITS_PER_TYPE(typeof_member(struct wait_queue_entry, flags))
+
+/* after WQ_FLAG_* for safety */
+#define I915_SW_FENCE_FLAG_FENCE BIT(WQ_FLAG_BITS - 1)
+#define I915_SW_FENCE_FLAG_ALLOC BIT(WQ_FLAG_BITS - 2)
+
 enum {
 	DEBUG_FENCE_IDLE = 0,
 	DEBUG_FENCE_NOTIFY,
@@ -154,10 +159,10 @@ static void __i915_sw_fence_wake_up_all(struct i915_sw_fence *fence,
 	spin_lock_irqsave_nested(&x->lock, flags, 1 + !!continuation);
 	if (continuation) {
 		list_for_each_entry_safe(pos, next, &x->head, entry) {
-			if (pos->func == autoremove_wake_function)
-				pos->func(pos, TASK_NORMAL, 0, continuation);
-			else
+			if (pos->flags & I915_SW_FENCE_FLAG_FENCE)
 				list_move_tail(&pos->entry, continuation);
+			else
+				pos->func(pos, TASK_NORMAL, 0, continuation);
 		}
 	} else {
 		LIST_HEAD(extra);
@@ -166,9 +171,9 @@ static void __i915_sw_fence_wake_up_all(struct i915_sw_fence *fence,
 			list_for_each_entry_safe(pos, next, &x->head, entry) {
 				int wake_flags;
 
-				wake_flags = fence->error;
-				if (pos->func == autoremove_wake_function)
-					wake_flags = 0;
+				wake_flags = 0;
+				if (pos->flags & I915_SW_FENCE_FLAG_FENCE)
+					wake_flags = fence->error;
 
 				pos->func(pos, TASK_NORMAL, wake_flags, &extra);
 			}
@@ -332,8 +337,8 @@ static int __i915_sw_fence_await_sw_fence(struct i915_sw_fence *fence,
 					  struct i915_sw_fence *signaler,
 					  wait_queue_entry_t *wq, gfp_t gfp)
 {
+	unsigned int pending;
 	unsigned long flags;
-	int pending;
 
 	debug_fence_assert(fence);
 	might_sleep_if(gfpflags_allow_blocking(gfp));
@@ -349,7 +354,7 @@ static int __i915_sw_fence_await_sw_fence(struct i915_sw_fence *fence,
 	if (unlikely(i915_sw_fence_check_if_after(fence, signaler)))
 		return -EINVAL;
 
-	pending = 0;
+	pending = I915_SW_FENCE_FLAG_FENCE;
 	if (!wq) {
 		wq = kmalloc(sizeof(*wq), gfp);
 		if (!wq) {
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2020-11-13  9:41 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-13  9:40 [Intel-gfx] [PATCH 01/33] drm/i915/gt: Include semaphore status in print_request() Chris Wilson
2020-11-13  9:40 ` [Intel-gfx] [PATCH 02/33] drm/i915: Lift i915_request_show() Chris Wilson
2020-11-13  9:40 ` [Intel-gfx] [PATCH 03/33] drm/i915/gt: Show all active timelines for debugging Chris Wilson
2020-11-13  9:40 ` [Intel-gfx] [PATCH 04/33] drm/i915: Lift waiter/signaler iterators Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 05/33] drm/i915: Show timeline dependencies for debug Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 06/33] drm/i915/selftests: Improve granularity for mocs reset checks Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 07/33] drm/i915/gem: Drop free_work for GEM contexts Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 08/33] drm/i915/gt: Ignore dt==0 for reporting underflows Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 09/33] drm/i915/gt: Defer enabling the breadcrumb interrupt to after submission Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 10/33] drm/i915/gt: Track signaled breadcrumbs outside of the breadcrumb spinlock Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 11/33] drm/i915/gt: Don't cancel the interrupt shadow too early Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 12/33] drm/i915/gt: Free stale request on destroying the virtual engine Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 13/33] drm/i915/gt: Protect context lifetime with RCU Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 14/33] drm/i915/gt: Split the breadcrumb spinlock between global and contexts Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 15/33] drm/i915/gt: Move the breadcrumb to the signaler if completed upon cancel Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 16/33] drm/i915/gt: Decouple completed requests on unwind Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 17/33] drm/i915/gt: Check for a completed last request once Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 18/33] drm/i915/gt: Replace direct submit with direct call to tasklet Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 19/33] drm/i915/gt: ce->inflight updates are now serialised Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 20/33] drm/i915/gt: Use virtual_engine during execlists_dequeue Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 21/33] drm/i915/gt: Decouple inflight virtual engines Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 22/33] drm/i915/gt: Defer schedule_out until after the next dequeue Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 23/33] drm/i915/gt: Remove virtual breadcrumb before transfer Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 24/33] drm/i915/gt: Shrink the critical section for irq signaling Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 25/33] drm/i915/gt: Resubmit the virtual engine on schedule-out Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 26/33] drm/i915/gt: Simplify virtual engine handling for execlists_hold() Chris Wilson
2020-11-13  9:41 ` Chris Wilson [this message]
2020-11-13  9:41 ` [Intel-gfx] [PATCH 28/33] drm/i915/gt: Wrap intel_timeline.has_initial_breadcrumb Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 29/33] drm/i915/gt: Track timeline GGTT offset separately from subpage offset Chris Wilson
2020-11-13  9:49   ` Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 30/33] drm/i915/gt: Add timeline "mode" Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 31/33] drm/i915/gt: Use indices for writing into relative timelines Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 32/33] drm/i915/selftests: Exercise relative timeline modes Chris Wilson
2020-11-13  9:41 ` [Intel-gfx] [PATCH 33/33] drm/i915/gt: Use ppHWSP for unshared non-semaphore related timelines Chris Wilson
2020-11-13 10:33 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/33] drm/i915/gt: Include semaphore status in print_request() Patchwork
2020-11-13 10:35 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2020-11-13 11:06 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " 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=20201113094128.8740-27-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: 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.